diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-15 14:25:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-15 14:25:30 -0400 |
commit | e7dc59252bd722377938ac3e6b4fd7e077f05293 (patch) | |
tree | 6a51b88aa97db1ff7dfa0313876b28844764aab1 /test | |
parent | fc02d16e728dfdd5a5f2e3bc622bbceb7f8c0d24 (diff) | |
parent | 8de56070393ad449dc54ae622d9b82f28a6a5c52 (diff) | |
download | podman-e7dc59252bd722377938ac3e6b4fd7e077f05293.tar.gz podman-e7dc59252bd722377938ac3e6b4fd7e077f05293.tar.bz2 podman-e7dc59252bd722377938ac3e6b4fd7e077f05293.zip |
Merge pull request #9716 from Luap99/remote-libpod
Do not leak libpod package into the remote client
Diffstat (limited to 'test')
-rw-r--r-- | test/e2e/containers_conf_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index 6b1a0d16e..aa2380c51 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -311,7 +311,7 @@ var _ = Describe("Podman run", func() { session = podmanTest.Podman([]string{"run", ALPINE, "date", "+'%H %Z'"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - Expect(session.OutputToString()).To(ContainSubstring("EST")) + Expect(session.OutputToString()).To(Or(ContainSubstring("EST"), ContainSubstring("EDT"))) // Umask session = podmanTest.Podman([]string{"run", "--rm", ALPINE, "sh", "-c", "umask"}) |