From 437d9d2cdeae7ffa01dbe06f96d155f1da36a689 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 26 Sep 2019 10:35:16 -0400 Subject: 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 --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d3e56ecdf..598384582 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ /test/bin2img/bin2img /test/checkseccomp/checkseccomp /test/copyimg/copyimg +/test/goecho/goecho /build/ .nfs* .ropeproject -- cgit v1.2.3-54-g00ecf