Added/Updated tests\bugs\core_3450_test.py: Separated expected output for FB major versions prior/since 6.x. Checked on 6.0.0.876; 5.0.3.1668; 4.0.6.3214; 3.0.13.33813.

pavel-zotov · pavel-zotov · commit 61fef55e542a · 2025-06-27T19:47:18.000+03:00
diff --git a/tests/bugs/core_3450_test.py b/tests/bugs/core_3450_test.py
@@ -8,16 +8,11 @@
 JIRA:        CORE-3450
 FBTEST:      bugs.core_3450
 NOTES:
-  [30.11.2016] pzotov
-  It seems that we have regression in current 4.0 snapshots (elapsed time more than 10x comparing with 2.5).
-  Also, 4.0 has different plan comparing with 3.0.
-  After discuss with dimitr it was decided to commit this test into fbt-repo in order to have constant
-  reminder about this issue.
-  Currently this test should FAIL on 4.0.
-
-  [22.09.2022] pzotov
-  Removed SKIP notation because test works fine on FB 4.0.1
-  Checked on 3.0.8.33535, 4.0.1.2692, 5.0.0.736
+    [27.06.2025] pzotov
+    Separated expected output for FB major versions prior/since 6.x.
+    No substitutions are used to suppress schema and quotes. Discussed with dimitr, 24.06.2025 12:39.
+
+    Checked on 6.0.0.876; 5.0.3.1668; 4.0.6.3214; 3.0.13.33813.
 """
 
 import pytest
@@ -101,13 +96,16 @@
 
 act = isql_act('db', test_script)
 
-expected_stdout = """
+expected_stdout_5x = """
     PLAN JOIN (JOIN (P1 NATURAL, T1 INDEX (TEST_1_F2)), T2 INDEX (TEST_2_F1), T3 INDEX (TEST_3_F1))
 """
 
+expected_stdout_6x = """
+    PLAN JOIN (JOIN ("P1" NATURAL, "T1" INDEX ("PUBLIC"."TEST_1_F2")), "T2" INDEX ("PUBLIC"."TEST_2_F1"), "T3" INDEX ("PUBLIC"."TEST_3_F1"))
+"""
+
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    act.expected_stdout = expected_stdout
-    act.execute()
+    act.expected_stdout = expected_stdout_5x if act.is_version('<6') else expected_stdout_6x
+    act.execute(combine_output = True)
     assert act.clean_stdout == act.clean_expected_stdout
-
