Engine version should be compared with tested value via Action.is_version() rather than excessive connect to services and obtaining it from srv.info. Changed code after suggestion by pcisar.

tests/bugs/core_3553_test.py

@@ -39,10 +39,7 @@ fb5x_checked_stdout = """
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    with act.connect_server() as srv:
-        engine_major = int(srv.info.engine_version)
-
-    act.expected_stdout = fb3x_checked_stdout if engine_major < 5 else fb5x_checked_stdout
+    act.expected_stdout = fb3x_checked_stdout if act.is_version('<5') else fb5x_checked_stdout
     act.execute()
     assert act.clean_stdout == act.clean_expected_stdout
 

tests/bugs/core_3834_test.py

@@ -41,9 +41,6 @@ fb5x_checked_stdout = """
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    with act.connect_server() as srv:
-        engine_major = int(srv.info.engine_version)
-
-    act.expected_stdout = fb3x_checked_stdout if engine_major < 5 else fb5x_checked_stdout
+    act.expected_stdout = fb3x_checked_stdout if act.is_version('<5') else fb5x_checked_stdout
     act.execute()
     assert act.clean_stdout == act.clean_expected_stdout

tests/bugs/core_4492_test.py

@@ -76,10 +76,7 @@ fb5x_checked_stdout = """
 
 @pytest.mark.version('>=3.0.3')
 def test_1(act: Action):
-    with act.connect_server() as srv:
-        engine_major = int(srv.info.engine_version)
-
-    act.expected_stdout = fb3x_checked_stdout if engine_major < 5 else fb5x_checked_stdout
+    act.expected_stdout = fb3x_checked_stdout if act.is_version('<5') else fb5x_checked_stdout
     act.execute()
     assert act.clean_stdout == act.clean_expected_stdout
 

tests/bugs/core_4528_test.py

@@ -127,10 +127,7 @@ fb5x_checked_stdout = """
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    with act.connect_server() as srv:
-        engine_major = int(srv.info.engine_version)
-
-    act.expected_stdout = fb3x_checked_stdout if engine_major < 5 else fb5x_checked_stdout
+    act.expected_stdout = fb3x_checked_stdout if act.is_version('<5') else fb5x_checked_stdout
     act.execute()
     assert act.clean_stdout == act.clean_expected_stdout
 

tests/bugs/core_4809_test.py

@@ -203,11 +203,7 @@ fb5x_checked_stdout = """
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    with act.connect_server() as srv:
-        engine_major = int(srv.info.engine_version)
-
-    act.expected_stdout = fb3x_checked_stdout if engine_major < 5 else fb5x_checked_stdout
-
+    act.expected_stdout = fb3x_checked_stdout if act.is_version('<5') else fb5x_checked_stdout
     act.execute()
     assert act.clean_stdout == act.clean_expected_stdout
 

tests/bugs/core_5598_test.py

@@ -60,11 +60,8 @@ def test_1(act: Action):
         c = con.cursor()
         c.execute(f"insert into test(id, s) select row_number()over(), lpad('', 8191, 'Алексей, Łukasz, Máté, François, Jørgen, Νικόλαος') from rdb$types,rdb$types rows {MIN_RECS_TO_ADD}")
         con.commit()
-        engine_major = int(con.info.engine_version)
-    #
-    #act.expected_stdout = expected_stdout
-    act.expected_stdout = fb3x_checked_stdout if engine_major < 5 else fb5x_checked_stdout
 
+    act.expected_stdout = fb3x_checked_stdout if act.is_version('<5') else fb5x_checked_stdout
     act.isql(switches=['-q'], input=test_script)
     act.stdout = act.stdout.upper()
     assert act.clean_stdout == act.clean_expected_stdout

tests/functional/arno/optimizer/test_opt_inner_join_merge_06.py

@@ -101,9 +101,6 @@ fb5x_checked_stdout = """
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    with act.connect_server() as srv:
-        engine_major = int(srv.info.engine_version)
-
-    act.expected_stdout = fb3x_checked_stdout if engine_major < 5 else fb5x_checked_stdout
+    act.expected_stdout = fb3x_checked_stdout if act.is_version('<5') else fb5x_checked_stdout
     act.execute()
     assert act.clean_stdout == act.clean_expected_stdout

tests/functional/arno/optimizer/test_opt_mixed_joins_02.py

@@ -107,9 +107,6 @@ fb5x_checked_stdout = """
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    with act.connect_server() as srv:
-        engine_major = int(srv.info.engine_version)
-
-    act.expected_stdout = fb3x_checked_stdout if engine_major < 5 else fb5x_checked_stdout
+    act.expected_stdout = fb3x_checked_stdout if act.is_version('<5') else fb5x_checked_stdout
     act.execute()
     assert act.clean_stdout == act.clean_expected_stdout

tests/functional/arno/optimizer/test_opt_mixed_joins_05.py

@@ -129,9 +129,6 @@ fb5x_checked_stdout = """
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    with act.connect_server() as srv:
-        engine_major = int(srv.info.engine_version)
-
-    act.expected_stdout = fb3x_checked_stdout if engine_major < 5 else fb5x_checked_stdout
+    act.expected_stdout = fb3x_checked_stdout if act.is_version('<5') else fb5x_checked_stdout
     act.execute()
     assert act.clean_stdout == act.clean_expected_stdout

tests/functional/arno/optimizer/test_opt_mixed_joins_06.py

@@ -124,9 +124,6 @@ fb5x_checked_stdout = """
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    with act.connect_server() as srv:
-        engine_major = int(srv.info.engine_version)
-
-    act.expected_stdout = fb3x_checked_stdout if engine_major < 5 else fb5x_checked_stdout
+    act.expected_stdout = fb3x_checked_stdout if act.is_version('<5') else fb5x_checked_stdout
     act.execute()
     assert act.clean_stdout == act.clean_expected_stdout