diff options
author | Valentin Rothberg <vrothberg@redhat.com> | 2022-05-10 13:56:10 +0200 |
---|---|---|
committer | Valentin Rothberg <vrothberg@redhat.com> | 2022-05-12 10:51:13 +0200 |
commit | ecf0177a01535b273a62e12577d7caf062a91117 (patch) | |
tree | 9b60e2c34b3d90c3223cfc9af372f3938649df33 /test/e2e | |
parent | f65e13eb7aa5874faad579bee2ac16170d467845 (diff) | |
download | podman-ecf0177a01535b273a62e12577d7caf062a91117.tar.gz podman-ecf0177a01535b273a62e12577d7caf062a91117.tar.bz2 podman-ecf0177a01535b273a62e12577d7caf062a91117.zip |
vendor c/common@main
In hope to fix a CI flake.
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Diffstat (limited to 'test/e2e')
-rw-r--r-- | test/e2e/containers_conf_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index b48e1ed62..854bf7420 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -456,13 +456,12 @@ var _ = Describe("Verify podman containers.conf usage", func() { containersConf = []byte("[engine]\nimage_copy_tmp_dir=\"storage1\"") err = ioutil.WriteFile(configPath, containersConf, os.ModePerm) Expect(err).ToNot(HaveOccurred()) - if IsRemote() { - podmanTest.RestartRemoteService() - } + + SkipIfRemote("Restarting the system service will fail loading the broken containers.conf") session = podmanTest.Podman([]string{"info", "--format", "{{.Store.ImageCopyTmpDir}}"}) session.WaitWithDefaultTimeout() - Expect(session).Should(Exit(0)) + Expect(session).Should(Exit(125)) Expect(session.Err.Contents()).To(ContainSubstring("invalid image_copy_tmp_dir")) }) |