summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-06 13:28:20 -0400
committerGitHub <noreply@github.com>2020-07-06 13:28:20 -0400
commit9532509c50113ac9470108e3492e2769bac533e8 (patch)
tree4d691205d2c574b6c7ab6eb3c62937b327898f58 /test
parent9eac75a967e3459b32b1acd220afb49b60f5e5aa (diff)
parent9a1543caec75a7b02dd2ec9a1111756bb1716454 (diff)
downloadpodman-9532509c50113ac9470108e3492e2769bac533e8.tar.gz
podman-9532509c50113ac9470108e3492e2769bac533e8.tar.bz2
podman-9532509c50113ac9470108e3492e2769bac533e8.zip
Merge pull request #6836 from ashley-cui/tzlibpod
Add --tz flag to create, run
Diffstat (limited to 'test')
-rw-r--r--test/e2e/config/containers.conf2
-rw-r--r--test/e2e/containers_conf_test.go9
-rw-r--r--test/e2e/create_test.go27
-rw-r--r--test/e2e/run_test.go25
4 files changed, 63 insertions, 0 deletions
diff --git a/test/e2e/config/containers.conf b/test/e2e/config/containers.conf
index a3bdde786..0a07676c4 100644
--- a/test/e2e/config/containers.conf
+++ b/test/e2e/config/containers.conf
@@ -48,3 +48,5 @@ default_sysctls = [
dns_searches=[ "foobar.com", ]
dns_servers=[ "1.2.3.4", ]
dns_options=[ "debug", ]
+
+tz = "Pacific/Honolulu"
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
index 26da9486d..d8e5f2e69 100644
--- a/test/e2e/containers_conf_test.go
+++ b/test/e2e/containers_conf_test.go
@@ -211,4 +211,13 @@ var _ = Describe("Podman run", func() {
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("search")).To(BeFalse())
})
+
+ It("podman run containers.conf timezone", func() {
+ //containers.conf timezone set to Pacific/Honolulu
+ session := podmanTest.Podman([]string{"run", ALPINE, "date", "+'%H %Z'"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ Expect(session.OutputToString()).To(ContainSubstring("HST"))
+
+ })
})
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index 5f96f96b1..1e33be013 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -471,4 +471,31 @@ var _ = Describe("Podman create", func() {
Expect(len(data)).To(Equal(1))
Expect(data[0].Config.StopSignal).To(Equal(uint(15)))
})
+
+ It("podman create --tz", func() {
+ session := podmanTest.Podman([]string{"create", "--tz", "foo", "--name", "bad", ALPINE, "date"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Not(Equal(0)))
+
+ session = podmanTest.Podman([]string{"create", "--tz", "America", "--name", "dir", ALPINE, "date"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Not(Equal(0)))
+
+ session = podmanTest.Podman([]string{"create", "--tz", "Pacific/Honolulu", "--name", "zone", ALPINE, "date"})
+ session.WaitWithDefaultTimeout()
+ inspect := podmanTest.Podman([]string{"inspect", "zone"})
+ inspect.WaitWithDefaultTimeout()
+ data := inspect.InspectContainerToJSON()
+ Expect(len(data)).To(Equal(1))
+ Expect(data[0].Config.Timezone).To(Equal("Pacific/Honolulu"))
+
+ session = podmanTest.Podman([]string{"create", "--tz", "local", "--name", "lcl", ALPINE, "date"})
+ session.WaitWithDefaultTimeout()
+ inspect = podmanTest.Podman([]string{"inspect", "lcl"})
+ inspect.WaitWithDefaultTimeout()
+ data = inspect.InspectContainerToJSON()
+ Expect(len(data)).To(Equal(1))
+ Expect(data[0].Config.Timezone).To(Equal("local"))
+ })
+
})
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index e7b68c60f..f49770727 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -1047,4 +1047,29 @@ USER mail`
Expect(session.ExitCode()).To(Equal(0))
Expect(strings.Contains(session.OutputToString(), groupName)).To(BeTrue())
})
+
+ It("podman run --tz", func() {
+ session := podmanTest.Podman([]string{"run", "--tz", "foo", "--rm", ALPINE, "date"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Not(Equal(0)))
+
+ session = podmanTest.Podman([]string{"run", "--tz", "America", "--rm", ALPINE, "date"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Not(Equal(0)))
+
+ session = podmanTest.Podman([]string{"run", "--tz", "Pacific/Honolulu", "--rm", ALPINE, "date", "+'%H %Z'"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ Expect(session.OutputToString()).To(ContainSubstring("HST"))
+
+ session = podmanTest.Podman([]string{"run", "--tz", "local", "--rm", ALPINE, "date", "+'%H %Z'"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ t := time.Now()
+ z, _ := t.Zone()
+ h := strconv.Itoa(t.Hour())
+ Expect(session.OutputToString()).To(ContainSubstring(z))
+ Expect(session.OutputToString()).To(ContainSubstring(h))
+
+ })
})