From ecf0177a01535b273a62e12577d7caf062a91117 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 10 May 2022 13:56:10 +0200 Subject: vendor c/common@main In hope to fix a CI flake. Signed-off-by: Valentin Rothberg --- test/e2e/containers_conf_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'test/e2e/containers_conf_test.go') 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")) }) -- cgit v1.2.3-54-g00ecf