Updated tests\bugs\core_1549_test.py: adjust expected stdout/stderr to current FB version.

tests/bugs/core_1549_test.py

@@ -65,7 +65,7 @@ test_script = """
 
 act = isql_act('db', test_script)
 
-expected_stdout = """
+fb3x_expected_out = """
         EXISTS with ref. to 1st stream:
 
         Select Expression
@@ -110,9 +110,54 @@ expected_stdout = """
                             -> Index "T_ID" Range Scan (lower bound: 1/1)
 """
 
+fb5x_expected_out = """
+    EXISTS with ref. to 1st stream: 
+
+    Sub-query
+        -> Filter
+            -> Table "T" as "X" Access By ID
+                -> Bitmap
+                    -> Index "T_ID" Range Scan (full match)
+    Sub-query
+        -> Filter
+            -> Table "T" as "Z" Access By ID
+                -> Bitmap
+                    -> Index "T_ID" Range Scan (full match)
+    Select Expression
+        -> Nested Loop Join (inner)
+            -> Filter
+                -> Table "T" as "A" Full Scan
+            -> Filter
+                -> Table "T" as "B" Access By ID
+                    -> Bitmap
+                        -> Index "T_ID" Range Scan (lower bound: 1/1)
+
+    Two sep. DT and EXISTS inside:  
+
+
+
+    Sub-query
+        -> Filter
+            -> Table "T" as "B X" Access By ID
+                -> Bitmap
+                    -> Index "T_ID" Range Scan (full match)
+    Sub-query
+        -> Filter
+            -> Table "T" as "A X" Access By ID
+                -> Bitmap
+                    -> Index "T_ID" Range Scan (full match)
+    Select Expression
+        -> Nested Loop Join (inner)
+            -> Filter
+                -> Table "T" as "A T1" Full Scan
+            -> Filter
+                -> Table "T" as "B T2" Access By ID
+                    -> Bitmap
+                        -> Index "T_ID" Range Scan (lower bound: 1/1)
+"""
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    act.expected_stdout = expected_stdout
+    act.expected_stdout = fb3x_expected_out if act.is_version('<5') else fb5x_expected_out
-    act.execute()
+    act.execute(combine_output = True)
     assert act.clean_stdout == act.clean_expected_stdout