Merge cockroachdb#72504

72504: logic_test/set_time_zone: fix DST related test flake r=ajwerner a=otan Tokyo has no DST, so that will prevent this class of errors for now. Release note: None Co-authored-by: Oliver Tan <[email protected]>
arulajmani · Nov 7, 2021 · a0849b1 · a0849b1
2 parents 46b7efa + 2ff004d
commit a0849b1
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/pkg/sql/logictest/testdata/logic_test/set_time_zone b/pkg/sql/logictest/testdata/logic_test/set_time_zone
@@ -207,30 +207,17 @@ SELECT TIME '05:40:00'::TIMETZ
 0000-01-01 05:40:00 +0300 +0300
 
 statement ok
-SET TIME ZONE 'America/New_York'
+SET TIME ZONE 'Asia/Tokyo'
 
 query T
 SHOW TIME ZONE
 ----
-America/New_York
+Asia/Tokyo
 
 query T
 SELECT TIME '05:40:00'::TIMETZ
 ----
-0000-01-01 05:40:00 -0400 -0400
-
-statement ok
-SET TIME ZONE 'PST8PDT'
-
-query T
-SHOW TIME ZONE
-----
-PST8PDT
-
-query T
-SELECT TIME '05:40:00'::TIMETZ
-----
-0000-01-01 05:40:00 -0700 -0700
+0000-01-01 05:40:00 +0900 +0900
 
 statement ok
 SET TIME ZONE 'zulu'