opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-02 02:26:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4118 from cevich/fix_sig_proxy

Browse Source 
Move noCache logic lower in stack
This commit is contained in:
OpenShift Merge Robot
2019-09-27 23:21:25 -07:00
committed by GitHub
parent e87012de12 437d9d2cde
commit 01a802e546
6 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,6 +12,7 @@
/test/bin2img/bin2img /test/bin2img/bin2img
/test/checkseccomp/checkseccomp /test/checkseccomp/checkseccomp
/test/copyimg/copyimg /test/copyimg/copyimg
/test/goecho/goecho
/build/ /build/
.nfs* .nfs*
.ropeproject .ropeproject

2
test/e2e/common_test.go
View File

@ -416,7 +416,7 @@ func (p *PodmanTestIntegration) BuildImage(dockerfile, imageName string, layers
// PodmanPID execs podman and returns its PID // PodmanPID execs podman and returns its PID
func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegration, int) { func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegration, int) {
podmanOptions := p.MakeOptions(args, false) podmanOptions := p.MakeOptions(args, false, false)
fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " ")) fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " "))
command := exec.Command(p.PodmanBinary, podmanOptions...) command := exec.Command(p.PodmanBinary, podmanOptions...)
session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter) session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)

4
test/e2e/libpod_suite_remoteclient_test.go
View File

@ -36,7 +36,7 @@ func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration
// PodmanNoCache calls podman with out adding the imagecache // PodmanNoCache calls podman with out adding the imagecache
func (p *PodmanTestIntegration) PodmanNoCache(args []string) *PodmanSessionIntegration { func (p *PodmanTestIntegration) PodmanNoCache(args []string) *PodmanSessionIntegration {
podmanSession := p.PodmanBase(args, true, false) podmanSession := p.PodmanBase(args, false, true)
return &PodmanSessionIntegration{podmanSession} return &PodmanSessionIntegration{podmanSession}
} }
@ -142,7 +142,7 @@ func (p *PodmanTestIntegration) StopVarlink() {
} }
//MakeOptions assembles all the podman main options //MakeOptions assembles all the podman main options
func (p *PodmanTestIntegration) makeOptions(args []string, noEvents bool) []string { func (p *PodmanTestIntegration) makeOptions(args []string, noEvents, noCache bool) []string {
return args return args
} }

9
test/e2e/libpod_suite_test.go
View File

@ -29,7 +29,7 @@ func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration
// PodmanNoCache calls the podman command with no configured imagecache // PodmanNoCache calls the podman command with no configured imagecache
func (p *PodmanTestIntegration) PodmanNoCache(args []string) *PodmanSessionIntegration { func (p *PodmanTestIntegration) PodmanNoCache(args []string) *PodmanSessionIntegration {
podmanSession := p.PodmanBase(args, true, false) podmanSession := p.PodmanBase(args, false, true)
return &PodmanSessionIntegration{podmanSession} return &PodmanSessionIntegration{podmanSession}
} }
@ -66,7 +66,7 @@ func PodmanTestCreate(tempDir string) *PodmanTestIntegration {
} }
// MakeOptions assembles all the podman main options // MakeOptions assembles all the podman main options
func (p *PodmanTestIntegration) makeOptions(args []string, noEvents bool) []string { func (p *PodmanTestIntegration) makeOptions(args []string, noEvents, noCache bool) []string {
var debug string var debug string
if _, ok := os.LookupEnv("DEBUG"); ok { if _, ok := os.LookupEnv("DEBUG"); ok {
debug = "--log-level=debug --syslog=true " debug = "--log-level=debug --syslog=true "
@ -84,6 +84,11 @@ func (p *PodmanTestIntegration) makeOptions(args []string, noEvents bool) []stri
} }
podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...) podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
if !noCache {
cacheOptions := []string{"--storage-opt",
fmt.Sprintf("%s.imagestore=%s", p.PodmanTest.ImageCacheFS, p.PodmanTest.ImageCacheDir)}
podmanOptions = append(cacheOptions, podmanOptions...)
}
podmanOptions = append(podmanOptions, args...) podmanOptions = append(podmanOptions, args...)
return podmanOptions return podmanOptions
} }

32
test/utils/utils.go
View File

@ -26,14 +26,14 @@ var (
// PodmanTestCommon contains common functions will be updated later in // PodmanTestCommon contains common functions will be updated later in
// the inheritance structs // the inheritance structs
type PodmanTestCommon interface { type PodmanTestCommon interface {
MakeOptions(args []string, noEvents bool) []string MakeOptions(args []string, noEvents, noCache bool) []string
WaitForContainer() bool WaitForContainer() bool
WaitContainerReady(id string, expStr string, timeout int, step int) bool WaitContainerReady(id string, expStr string, timeout int, step int) bool
} }
// PodmanTest struct for command line options // PodmanTest struct for command line options
type PodmanTest struct { type PodmanTest struct {
PodmanMakeOptions func(args []string, noEvents bool) []string PodmanMakeOptions func(args []string, noEvents, noCache bool) []string
PodmanBinary string PodmanBinary string
ArtifactPath string ArtifactPath string
TempDir string TempDir string
@ -59,24 +59,20 @@ type HostOS struct {
} }
// MakeOptions assembles all podman options // MakeOptions assembles all podman options
func (p *PodmanTest) MakeOptions(args []string, noEvents bool) []string { func (p *PodmanTest) MakeOptions(args []string, noEvents, noCache bool) []string {
return p.PodmanMakeOptions(args, noEvents) return p.PodmanMakeOptions(args, noEvents, noCache)
} }
// PodmanAsUserBase exec podman as user. uid and gid is set for credentials usage. env is used // PodmanAsUserBase exec podman as user. uid and gid is set for credentials usage. env is used
// to record the env for debugging // to record the env for debugging
func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string, env []string, nocache, noEvents bool) *PodmanSession { func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string, env []string, noEvents, noCache bool) *PodmanSession {
var command *exec.Cmd var command *exec.Cmd
podmanOptions := p.MakeOptions(args, noEvents) podmanOptions := p.MakeOptions(args, noEvents, noCache)
podmanBinary := p.PodmanBinary podmanBinary := p.PodmanBinary
if p.RemoteTest { if p.RemoteTest {
podmanBinary = p.RemotePodmanBinary podmanBinary = p.RemotePodmanBinary
env = append(env, fmt.Sprintf("PODMAN_VARLINK_ADDRESS=%s", p.VarlinkEndpoint)) env = append(env, fmt.Sprintf("PODMAN_VARLINK_ADDRESS=%s", p.VarlinkEndpoint))
} }
if !nocache && !p.RemoteTest {
cacheOptions := []string{"--storage-opt", fmt.Sprintf("%s.imagestore=%s", p.ImageCacheFS, p.ImageCacheDir)}
podmanOptions = append(cacheOptions, podmanOptions...)
}
if env == nil { if env == nil {
fmt.Printf("Running: %s %s\n", podmanBinary, strings.Join(podmanOptions, " ")) fmt.Printf("Running: %s %s\n", podmanBinary, strings.Join(podmanOptions, " "))
@ -105,8 +101,8 @@ func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string
} }
// PodmanBase exec podman with default env. // PodmanBase exec podman with default env.
func (p *PodmanTest) PodmanBase(args []string, nocache, noEvents bool) *PodmanSession { func (p *PodmanTest) PodmanBase(args []string, noEvents, noCache bool) *PodmanSession {
return p.PodmanAsUserBase(args, 0, 0, "", nil, nocache, noEvents) return p.PodmanAsUserBase(args, 0, 0, "", nil, noEvents, noCache)
} }
// WaitForContainer waits on a started container // WaitForContainer waits on a started container
@ -124,7 +120,7 @@ func (p *PodmanTest) WaitForContainer() bool {
// containers are currently running. // containers are currently running.
func (p *PodmanTest) NumberOfContainersRunning() int { func (p *PodmanTest) NumberOfContainersRunning() int {
var containers []string var containers []string
ps := p.PodmanBase([]string{"ps", "-q"}, true, false) ps := p.PodmanBase([]string{"ps", "-q"}, false, true)
ps.WaitWithDefaultTimeout() ps.WaitWithDefaultTimeout()
Expect(ps.ExitCode()).To(Equal(0)) Expect(ps.ExitCode()).To(Equal(0))
for _, i := range ps.OutputToStringArray() { for _, i := range ps.OutputToStringArray() {
@ -139,7 +135,7 @@ func (p *PodmanTest) NumberOfContainersRunning() int {
// containers are currently defined. // containers are currently defined.
func (p *PodmanTest) NumberOfContainers() int { func (p *PodmanTest) NumberOfContainers() int {
var containers []string var containers []string
ps := p.PodmanBase([]string{"ps", "-aq"}, true, false) ps := p.PodmanBase([]string{"ps", "-aq"}, false, true)
ps.WaitWithDefaultTimeout() ps.WaitWithDefaultTimeout()
Expect(ps.ExitCode()).To(Equal(0)) Expect(ps.ExitCode()).To(Equal(0))
for _, i := range ps.OutputToStringArray() { for _, i := range ps.OutputToStringArray() {
@ -154,7 +150,7 @@ func (p *PodmanTest) NumberOfContainers() int {
// pods are currently defined. // pods are currently defined.
func (p *PodmanTest) NumberOfPods() int { func (p *PodmanTest) NumberOfPods() int {
var pods []string var pods []string
ps := p.PodmanBase([]string{"pod", "ps", "-q"}, true, false) ps := p.PodmanBase([]string{"pod", "ps", "-q"}, false, true)
ps.WaitWithDefaultTimeout() ps.WaitWithDefaultTimeout()
Expect(ps.ExitCode()).To(Equal(0)) Expect(ps.ExitCode()).To(Equal(0))
for _, i := range ps.OutputToStringArray() { for _, i := range ps.OutputToStringArray() {
@ -170,7 +166,7 @@ func (p *PodmanTest) NumberOfPods() int {
func (p *PodmanTest) GetContainerStatus() string { func (p *PodmanTest) GetContainerStatus() string {
var podmanArgs = []string{"ps"} var podmanArgs = []string{"ps"}
podmanArgs = append(podmanArgs, "--all", "--format={{.Status}}") podmanArgs = append(podmanArgs, "--all", "--format={{.Status}}")
session := p.PodmanBase(podmanArgs, true, false) session := p.PodmanBase(podmanArgs, false, true)
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
return session.OutputToString() return session.OutputToString()
} }
@ -178,7 +174,7 @@ func (p *PodmanTest) GetContainerStatus() string {
// WaitContainerReady waits process or service inside container start, and ready to be used. // WaitContainerReady waits process or service inside container start, and ready to be used.
func (p *PodmanTest) WaitContainerReady(id string, expStr string, timeout int, step int) bool { func (p *PodmanTest) WaitContainerReady(id string, expStr string, timeout int, step int) bool {
startTime := time.Now() startTime := time.Now()
s := p.PodmanBase([]string{"logs", id}, true, false) s := p.PodmanBase([]string{"logs", id}, false, true)
s.WaitWithDefaultTimeout() s.WaitWithDefaultTimeout()
for { for {
@ -191,7 +187,7 @@ func (p *PodmanTest) WaitContainerReady(id string, expStr string, timeout int, s
return true return true
} }
time.Sleep(time.Duration(step) * time.Second) time.Sleep(time.Duration(step) * time.Second)
s = p.PodmanBase([]string{"logs", id}, true, false) s = p.PodmanBase([]string{"logs", id}, false, true)
s.WaitWithDefaultTimeout() s.WaitWithDefaultTimeout()
} }
} }

2
test/utils/utils_suite_test.go
View File

@ -32,7 +32,7 @@ func FakePodmanTestCreate() *FakePodmanTest {
return p return p
} }
func (p *FakePodmanTest) makeOptions(args []string, noEvents bool) []string { func (p *FakePodmanTest) makeOptions(args []string, noEvents, noCache bool) []string {
return FakeOutputs[strings.Join(args, " ")] return FakeOutputs[strings.Join(args, " ")]
} }