diff options
| author | Chris Evich <cevich@redhat.com> | 2019-09-26 10:35:16 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-09-26 10:56:24 -0400 |
| commit | 437d9d2cdeae7ffa01dbe06f96d155f1da36a689 (patch) | |
| tree | 75caab41fa20b42c6ec73403f91a258dd28ac2a6 /test/e2e/common_test.go | |
| parent | d76b21e27a7cef26865a05be02632ca76f9cf2ea (diff) | |
| download | podman-437d9d2cdeae7ffa01dbe06f96d155f1da36a689.tar.gz podman-437d9d2cdeae7ffa01dbe06f96d155f1da36a689.tar.bz2 podman-437d9d2cdeae7ffa01dbe06f96d155f1da36a689.zip | |
Move noCache logic lower in stack
One or more tests are not taking advantage of the local image cache.
This has been observed to cause a testing flake in at least one
`--sigproxy` test which uses `PodmanTestIntegration.PodmanPID()`.
It has a rather short timeout of 15-seconds, which isn't always
enough time to pull down a remote image.
Fix this by reloacing the `noCache` logic from
`PodmanTest.PodmanAsUserBase()` down the stack into
`PodmanTestIntegration.makeOptions()`. This also eliminates the need to
also check if a remote-client is being used - since it uses a different
function.
Also reverse the parameter order in `PodmanTest.PodmanBase` so that
everywhere is consistently `noEvents` then `noCache`.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 4e9881d59..42507f58c 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -412,7 +412,7 @@ func (p *PodmanTestIntegration) BuildImage(dockerfile, imageName string, layers // PodmanPID execs podman and returns its PID 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, " ")) command := exec.Command(p.PodmanBinary, podmanOptions...) session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter) |