Skip to content

Commit b58d1eb

Browse files
authored
chore(ci): fix some flaky test (#16980)
1 parent 2bb93bf commit b58d1eb

File tree

2 files changed

+41
-8
lines changed

2 files changed

+41
-8
lines changed

tests/sqllogictests/suites/query/functions/02_0012_function_datetimes_tz.test

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -882,13 +882,22 @@ SELECT substr(DATE_ADD(month, 1, now())::String, 11)=substr(now()::String, 11);
882882

883883
# format: 11
884884
query T
885-
SELECT substr(DATE_ADD(month, 1, now())::String, 6,2)=substr(now()::String, 6, 2)+1;
885+
SELECT substr(DATE_ADD(month, 1, now())::String, 6, 2) =
886+
CASE
887+
WHEN substr(now()::String, 6, 2) = '12' THEN '01'
888+
ELSE (substr(now()::String, 6, 2)::int + 1)::String
889+
END;
886890
----
887891
1
888892

889893
# format: 2024
890894
query T
891-
SELECT substr(DATE_ADD(month, 1, now())::String, 1,4)=substr(now()::String, 1,4);
895+
SELECT
896+
substr(DATE_ADD(month, 1, now())::String, 1,4) =
897+
CASE
898+
WHEN substr(now()::String, 6, 2) = '12' THEN (substr(now()::String, 1, 4)::int + 1)::String
899+
ELSE substr(now()::String, 1, 4)
900+
END;
892901
----
893902
1
894903

@@ -938,13 +947,21 @@ SELECT substr(DATE_ADD(month, 1, now())::String, 11)=substr(now()::String, 11);
938947

939948
# format: 11
940949
query T
941-
SELECT substr(DATE_ADD(month, 1, now())::String, 6,2)=substr(now()::String, 6, 2)+1;
950+
SELECT substr(DATE_ADD(month, 1, now())::String, 6, 2) =
951+
CASE
952+
WHEN substr(now()::String, 6, 2) = '12' THEN '01'
953+
ELSE (substr(now()::String, 6, 2)::int + 1)::String
954+
END;
942955
----
943956
1
944957

945958
# format: 2024
946959
query T
947-
SELECT substr(DATE_ADD(month, 1, now())::String, 1,4)=substr(now()::String, 1,4);
960+
SELECT substr(DATE_ADD(month, 1, now())::String, 1, 4) =
961+
CASE
962+
WHEN substr(now()::String, 6, 2) = '12' THEN (substr(now()::String, 1,4)::int+1)::String
963+
ELSE (substr(now()::String, 6, 2)::int + 1)::String
964+
END;
948965
----
949966
1
950967

tests/sqllogictests/suites/query/functions/02_0075_function_datetimes_tz.test

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -756,13 +756,21 @@ SELECT substr(DATE_ADD(month, 1, now())::String, 11)=substr(now()::String, 11);
756756

757757
# format: 11
758758
query T
759-
SELECT substr(DATE_ADD(month, 1, now())::String, 6,2)=substr(now()::String, 6, 2)+1;
759+
SELECT substr(DATE_ADD(month, 1, now())::String, 6, 2) =
760+
CASE
761+
WHEN substr(now()::String, 6, 2) = '12' THEN '01'
762+
ELSE (substr(now()::String, 6, 2)::int + 1)::String
763+
END;
760764
----
761765
1
762766

763767
# format: 2024
764768
query T
765-
SELECT substr(DATE_ADD(month, 1, now())::String, 1,4)=substr(now()::String, 1,4);
769+
SELECT substr(DATE_ADD(month, 1, now())::String, 1, 4) =
770+
CASE
771+
WHEN substr(now()::String, 6, 2) = '12' THEN (substr(now()::String, 1,4)::int+1)::String
772+
ELSE (substr(now()::String, 6, 2)::int + 1)::String
773+
END;
766774
----
767775
1
768776

@@ -802,13 +810,21 @@ SELECT substr(DATE_ADD(month, 1, now())::String, 11)=substr(now()::String, 11);
802810

803811
# format: 11
804812
query T
805-
SELECT substr(DATE_ADD(month, 1, now())::String, 6,2)=substr(now()::String, 6, 2)+1;
813+
SELECT substr(DATE_ADD(month, 1, now())::String, 6, 2) =
814+
CASE
815+
WHEN substr(now()::String, 6, 2) = '12' THEN '01'
816+
ELSE (substr(now()::String, 6, 2)::int + 1)::String
817+
END;
806818
----
807819
1
808820

809821
# format: 2024
810822
query T
811-
SELECT substr(DATE_ADD(month, 1, now())::String, 1,4)=substr(now()::String, 1,4);
823+
SELECT substr(DATE_ADD(month, 1, now())::String, 1, 4) =
824+
CASE
825+
WHEN substr(now()::String, 6, 2) = '12' THEN (substr(now()::String, 1,4)::int+1)::String
826+
ELSE (substr(now()::String, 6, 2)::int + 1)::String
827+
END;
812828
----
813829
1
814830

0 commit comments

Comments
 (0)