summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authoropenshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com>2021-08-04 18:47:18 +0000
committerGitHub <noreply@github.com>2021-08-04 18:47:18 +0000
commitc887018571ac6dc7c3eeb1d039685d4606850311 (patch)
tree20e1af0ad47f8846dde65e168159d3a5b46d1529 /test/e2e
parent9c2fc4b6228889ea850656468381a8be45f7e3cd (diff)
parentf40a0e7c8138dbfe9f924e51aacef070efb15162 (diff)
downloadpodman-c887018571ac6dc7c3eeb1d039685d4606850311.tar.gz
podman-c887018571ac6dc7c3eeb1d039685d4606850311.tar.bz2
podman-c887018571ac6dc7c3eeb1d039685d4606850311.zip
Merge pull request #11128 from rhatdan/timezone
Handle timezone on server containers.conf
Diffstat (limited to 'test/e2e')
-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() {