New metadata + cleanup

tests/bugs/core_0000_test.py

@@ -18,9 +18,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)
-
-

tests/bugs/core_0091_test.py

@@ -40,9 +40,6 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)
 
 

tests/bugs/core_0195a_test.py

@@ -108,8 +108,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)
-

tests/bugs/core_0195b_test.py

@@ -137,7 +137,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_0366_test.py

@@ -448,7 +448,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_0696_test.py

@@ -27,7 +27,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_0733_test.py

@@ -342,6 +342,6 @@ expected_stdout = """
 """
 
 @pytest.mark.version('>=3.0')
-@pytest.mark.skip("Test fate to be determined")
+@pytest.mark.skip("FIXME: Test fate to be determined")
 def test_1():
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")

tests/bugs/core_0888_test.py

@@ -31,7 +31,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_0925_test.py

@@ -58,7 +58,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1002_test.py

@@ -21,7 +21,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=2.1')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1004_test.py

@@ -63,7 +63,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1006_test.py

@@ -41,7 +41,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1055_test.py

@@ -43,7 +43,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1078_test.py

@@ -24,7 +24,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1146_test.py

@@ -52,7 +52,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1152_test.py

@@ -27,7 +27,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1172_test.py

@@ -55,7 +55,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1329_test.py

@@ -30,7 +30,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1356_test.py

@@ -40,7 +40,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1371_test.py

@@ -28,7 +28,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1512_test.py

@@ -114,7 +114,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1544_test.py

@@ -139,9 +139,9 @@ expected_stdout = """
     R                               -9876543321
 """
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3')
-@pytest.mark.xfail
 def test_1(act: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 

tests/bugs/core_1609_test.py

@@ -129,7 +129,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0.1')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1735_test.py

@@ -27,7 +27,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1907_test.py

@@ -33,7 +33,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_1989_test.py

@@ -106,7 +106,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2022_test.py

@@ -37,7 +37,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2038_test.py

@@ -34,7 +34,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2039_test.py

@@ -29,7 +29,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2061_test.py

@@ -21,7 +21,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2098_test.py

@@ -38,7 +38,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2227_test.py

@@ -5,10 +5,16 @@ ID:          issue-2655
 ISSUE:       2655
 TITLE:       Problem with column names with Accents and triggers
 DESCRIPTION:
+NOTES:
+[25.1.2022] pcisar
+  For yet unknown reason, ISQL gets malformed stdin from act.execute() although it was passed
+  correctly encoded in iso8859_1. Test changed to use script file writen in iso8859_1
+  which works fine.
 JIRA:        CORE-2227
 """
 
 import pytest
+from pathlib import Path
 from firebird.qa import *
 
 init_script = """
@@ -26,14 +32,15 @@ test_script = """
     AS
     BEGIN
       NEW."CÓDIGO" = 1;
-    END ^
+    END
+    ^
 """
 
 act = isql_act('db', test_script)
 
+script_file = temp_file('test_script.sql')
+
 @pytest.mark.version('>=3')
-def test_1(act: Action):
+def test_1(act: Action, script_file: Path):
-    try:
+    script_file.write_text(test_script, encoding='iso8859_1')
-        act.execute(charset='utf8')
+    act.isql(switches=[], input_file=script_file)
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2257_test.py

@@ -47,7 +47,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2264_test.py

@@ -32,7 +32,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2308_test.py

@@ -45,7 +45,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2416_test.py

@@ -50,7 +50,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2427_test.py

@@ -24,7 +24,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2451_test.py

@@ -27,7 +27,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2457_test.py

@@ -27,7 +27,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2477_test.py

@@ -372,8 +372,8 @@ expected_stdout = """
 """
 
 @pytest.mark.version('>=3.0')
-@pytest.mark.skip("Test fate to be determined")
+@pytest.mark.skip("FIXME: Test fate to be determined")
 def test_1():
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 

tests/bugs/core_2484_test.py

@@ -163,7 +163,7 @@ expected_stdout = """
     STDERR: After line in file
 """
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3.0')
-@pytest.mark.xfail
 def test_1():
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")

tests/bugs/core_2493_test.py

@@ -73,11 +73,11 @@ expected_stdout = """
     OS user: valid, passed getpass.getuser()
 """
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3')
 @pytest.mark.platform('Windows')
-@pytest.mark.xfail
 def test_1(act: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 
 # test_script_1

tests/bugs/core_2538_test.py

@@ -43,7 +43,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2579_test.py

@@ -28,7 +28,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2822_test.py

@@ -30,7 +30,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_2907_test.py

@@ -76,7 +76,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3038_test.py

@@ -40,7 +40,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3047_test.py

@@ -27,7 +27,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute(charset='win1252')
-        act.execute(charset='win1252')
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3058_test.py

@@ -28,10 +28,10 @@ expected_stdout_1 = """
 
 TOTAL_SEQUENCES_COUNT = 33000
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3')
-@pytest.mark.xfail
 def test_1(act: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 # test_script_1
 #---

tests/bugs/core_3094_test.py

@@ -101,7 +101,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3256_test.py

@@ -181,7 +181,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3282_test.py

@@ -21,7 +21,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3296_test.py

@@ -63,7 +63,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3323_test.py

@@ -75,10 +75,10 @@ expected_stdout = """
     pointG:                         finished kill hanged connection
 """
 
-@pytest.mark.skip("Test fate to be determined")
+@pytest.mark.skip("FIXME: Test fate to be determined")
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    pytest.skip("Test not IMPLEMENTED")
+    pytest.skip("Not IMPLEMENTED")
 
 
 # test_script_1

tests/bugs/core_3330_test.py

@@ -26,7 +26,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3461_test.py

@@ -32,7 +32,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3511_test.py

@@ -105,11 +105,11 @@ expected_stdout_2 = """
     Done.
 """
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3.0')
 @pytest.mark.platform('Windows')
-@pytest.mark.xfail
 def test_2(act_2: Action, tmp_user: User):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 
 # test_script_2

tests/bugs/core_3557_test.py

@@ -29,7 +29,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3611_test.py

@@ -98,7 +98,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3658_test.py

@@ -25,10 +25,10 @@ Expected line found.
 Expected line found.
 """
 
-@pytest.mark.skip("Test fate to be determined")
+@pytest.mark.skip("FIXME: Test fate to be determined")
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    pytest.skip("Test not IMPLEMENTED")
+    pytest.skip("Not IMPLEMENTED")
 
 # test_script_1
 #---

tests/bugs/core_3753_test.py

@@ -70,7 +70,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3798_test.py

@@ -46,7 +46,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3820_test.py

@@ -24,7 +24,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3883_test.py

@@ -57,7 +57,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3884_test.py

@@ -55,10 +55,10 @@ expected_stdout = """
     Status vector is EXPECTED.
 """
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3')
-@pytest.mark.xfail
 def test_1(act_1: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 # test_script_1
 #---

tests/bugs/core_3937_test.py

@@ -50,7 +50,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3964_test.py

@@ -44,7 +44,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3965_test.py

@@ -88,7 +88,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_3966_test.py

@@ -110,7 +110,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4002_test.py

@@ -105,7 +105,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4068_test.py

@@ -28,7 +28,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4081_test.py

@@ -29,7 +29,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4108_test.py

@@ -33,7 +33,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4113_test.py

@@ -161,7 +161,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4184_test.py

@@ -30,7 +30,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4204_test.py

@@ -33,7 +33,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4247_test.py

@@ -71,7 +71,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4307_test.py

@@ -38,7 +38,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4417_test.py

@@ -21,7 +21,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4439_test.py

@@ -37,11 +37,11 @@ db = db_factory()
 act = python_act('db')
 
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3')
-@pytest.mark.platform('Windows')
 @pytest.mark.xfail
 def test_1(act: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 # test_script_1
 #---

tests/bugs/core_4462_test.py

@@ -47,12 +47,12 @@ expected_stdout_1 = """
     + VALIDATION FINISHED: 0 ERRORS, 0 WARNINGS, 0 FIXED
 """
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3.0.5')
 @pytest.mark.platform('Windows')
-@pytest.mark.xfail
 def test_1(act: Action):
     # This test should be reimplemnted in platform independent way!
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 # test_script_1
 #---

tests/bugs/core_4480_test.py

@@ -36,7 +36,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4493_test.py

@@ -33,7 +33,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4570_test.py

@@ -57,7 +57,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4571_test.py

@@ -77,11 +77,11 @@ expected_stdout = """
     NUMB                            ρουλεμάν
 """
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3.0')
 @pytest.mark.platform('Windows')
-@pytest.mark.xfail
 def test_1(act: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 
 # test_script_1

tests/bugs/core_4578_test.py

@@ -19,11 +19,11 @@ expected_stdout = """
     Unable to open
 """
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3')
 @pytest.mark.platform('Windows')
-@pytest.mark.xfail
 def test_1(act: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 
 # test_script_1

tests/bugs/core_4622_test.py

@@ -63,7 +63,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4623_test.py

@@ -55,7 +55,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4634_test.py

@@ -29,7 +29,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4678_test.py

@@ -63,7 +63,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4713_test.py

@@ -46,8 +46,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)
-

tests/bugs/core_4752_test.py

@@ -38,7 +38,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4766_test.py

@@ -62,7 +62,6 @@ expected_stdout_1 = """
 @pytest.mark.version('>=3.0,<4')
 #@pytest.mark.xfail
 def test_1(act: Action, capsys):
-    #pytest.fail("Test not IMPLEMENTED")
     sql_text = (act.files_dir / 'core_4766.sql').read_text()
     subs = {'dsn': act.db.dsn, 'user_name': act.db.user, 'user_password': act.db.password,
             'current_auth_plugin': None,}

tests/bugs/core_4841_test.py

@@ -27,49 +27,9 @@ test_script = """
 
 act = isql_act('db', test_script, substitutions=[('[-]?Password', 'Password')])
 
-# version: 3.0.7
+# version: 3.0.8
 
-expected_stderr_1 = """
+expected_stderr = """
-Statement failed, SQLSTATE = 42000
-unsuccessful metadata update
--CREATE USER U01 failed
--Password must be specified when creating user
-
-Statement failed, SQLSTATE = 42000
-unsuccessful metadata update
--CREATE USER U01 failed
--Password must be specified when creating user
-
-Statement failed, SQLSTATE = 42000
-unsuccessful metadata update
--CREATE USER U01 failed
--Password must be specified when creating user
-
-Statement failed, SQLSTATE = 42000
-unsuccessful metadata update
--CREATE USER U01 failed
--Password must be specified when creating user
-
-Statement failed, SQLSTATE = 42000
-unsuccessful metadata update
--CREATE USER U01 failed
--Password must be specified when creating user
-
-Statement failed, SQLSTATE = 42000
-unsuccessful metadata update
--CREATE USER PASSWORD failed
--Password must be specified when creating user
-"""
-
-@pytest.mark.version('>=3.0.7,<4')
-def test_1(act: Action):
-    act.expected_stderr = expected_stderr_1
-    act.execute()
-    assert act.clean_stderr == act.clean_expected_stderr
-
-# version: 4.0
-
-expected_stderr_2 = """
 Statement failed, SQLSTATE = 42000
 unsuccessful metadata update
 -CREATE USER U01 failed
@@ -104,9 +64,8 @@ unsuccessful metadata update
 -Password must be specified when creating user
 """
 
-@pytest.mark.version('>=4.0')
+@pytest.mark.version('>=3.0.8')
-def test_2(act: Action):
+def test_1(act: Action):
-    act.expected_stderr = expected_stderr_2
+    act.expected_stderr = expected_stderr
     act.execute()
     assert act.clean_stderr == act.clean_expected_stderr
-

tests/bugs/core_4864_test.py

@@ -48,7 +48,7 @@ expected_stdout = """
 @pytest.mark.skip('FIXME: databases.conf')
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 # test_script_1
 #---

tests/bugs/core_4880_test.py

@@ -60,10 +60,10 @@ expected_stdout = """
     Time ratio between COMMIT and COMPILE for standalone PSQL objects: acceptable
 """
 
+@pytest.mark.skip('FIXME: Not IMPLEMENTED')
 @pytest.mark.version('>=3.0')
-@pytest.mark.xfail
 def test_1(act: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 # test_script_1
 #---

tests/bugs/core_4947_test.py

@@ -24,7 +24,4 @@ act = isql_act('db', test_script)
 
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    try:
+    act.execute()
-        act.execute()
-    except ExecutionError as e:
-        pytest.fail("Test script execution failed", pytrace=False)

tests/bugs/core_4964_test.py

@@ -67,7 +67,7 @@ expected_stdout = """
 @pytest.mark.skip('FIXME: databases.conf')
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 # test_script_1
 #---

tests/bugs/core_4998_test.py

@@ -38,7 +38,7 @@ act = python_act('db')
 @pytest.mark.skip('FIXME: firebird.conf')
 @pytest.mark.version('>=3.0')
 def test_1(act: Action):
-    pytest.fail("Test not IMPLEMENTED")
+    pytest.fail("Not IMPLEMENTED")
 
 # test_script_1
 #---

tests/bugs/core_5016_test.py

@@ -1,26 +1,19 @@
 #coding:utf-8
-#
+
-# id:           bugs.core_5016
+"""
-# title:        Server crashes during GC when DELETE is executed after adding new referencing column
+ID:          issue-5304
-# decription:   
+ISSUE:       5304
-# tracker_id:   CORE-5016
+TITLE:       Server crashes during GC when DELETE is executed after adding new referencing column
-# min_versions: ['2.5.0']
+DESCRIPTION:
-# versions:     2.5
+JIRA:        CORE-5016
-# qmid:         None
+"""
 
 import pytest
-from firebird.qa import db_factory, isql_act, Action
+from firebird.qa import *
 
-# version: 2.5
+db = db_factory()
-# resources: None
 
-substitutions_1 = []
+test_script = """
-
-init_script_1 = """"""
-
-db_1 = db_factory(sql_dialect=3, init=init_script_1)
-
-test_script_1 = """
     create table a (x integer primary key);
     create table b (x integer primary key);
     insert into b values (1);
@@ -33,15 +26,15 @@ test_script_1 = """
     select count(*) as k from rdb$database;
 """
 
-act_1 = isql_act('db_1', test_script_1, substitutions=substitutions_1)
+act = isql_act('db', test_script)
 
-expected_stdout_1 = """
+expected_stdout = """
     K                               1
 """
 
-@pytest.mark.version('>=2.5')
+@pytest.mark.version('>=3')
-def test_1(act_1: Action):
+def test_1(act: Action):
-    act_1.expected_stdout = expected_stdout_1
+    act.expected_stdout = expected_stdout
-    act_1.execute()
+    act.execute()
-    assert act_1.clean_stdout == act_1.clean_expected_stdout
+    assert act.clean_stdout == act.clean_expected_stdout