summaryrefslogtreecommitdiff
path: root/test/e2e/containers_conf_test.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-08-04 07:38:22 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-08-04 08:59:19 -0400
commitf40a0e7c8138dbfe9f924e51aacef070efb15162 (patch)
treed72c32a4f1fcc87d48ca5752019055a568f22e47 /test/e2e/containers_conf_test.go
parent3a922cbc99f49b996c0379a9ec90ccc47a325018 (diff)
downloadpodman-f40a0e7c8138dbfe9f924e51aacef070efb15162.tar.gz
podman-f40a0e7c8138dbfe9f924e51aacef070efb15162.tar.bz2
podman-f40a0e7c8138dbfe9f924e51aacef070efb15162.zip
Handle timezone on server containers.conf
Fixes: https://github.com/containers/podman/issues/11124 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@localhost.localdomain> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test/e2e/containers_conf_test.go')
-rw-r--r--test/e2e/containers_conf_test.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
index 3349b8be3..08fc4e6cc 100644
--- a/test/e2e/containers_conf_test.go
+++ b/test/e2e/containers_conf_test.go
@@ -261,10 +261,16 @@ var _ = Describe("Podman run", func() {
It("podman run containers.conf timezone", func() {
//containers.conf timezone set to Pacific/Honolulu
- session := podmanTest.Podman([]string{"run", ALPINE, "date", "+'%H %Z'"})
+ session := podmanTest.Podman([]string{"run", "--tz", "", ALPINE, "date", "+'%H %Z'"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring("HST"))
+
+ // verify flag still overrides
+ session = podmanTest.Podman([]string{"run", "--tz", "EST", ALPINE, "date", "+'%H %Z'"})
+ session.WaitWithDefaultTimeout()
+ Expect(session).Should(Exit(0))
+ Expect(session.OutputToString()).To(ContainSubstring("EST"))
})
It("podman run containers.conf umask", func() {