From 70c619e52c497fed51141d0f471dd16a15fbf72e Mon Sep 17 00:00:00 2001 From: pavel-zotov Date: Tue, 12 Dec 2023 20:15:28 +0300 Subject: [PATCH] Added/Updated tests\bugs\core_4156_test.py: Added 'SQLSTATE' in substitutions: runtime error must not be suppressed. Added 'combine_output = True' in order to see SQLSTATE if any error occurs. --- tests/bugs/core_4156_test.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/bugs/core_4156_test.py b/tests/bugs/core_4156_test.py index 6fc53a68..7bdc5287 100644 --- a/tests/bugs/core_4156_test.py +++ b/tests/bugs/core_4156_test.py @@ -3,11 +3,15 @@ """ ID: issue-4483 ISSUE: 4483 -TITLE: RDB$GET_CONTEXT/RDB$SET_CONTEXT parameters incorrectly described as - CHAR NOT NULL instead of VARCHAR NULLABLE +TITLE: RDB$GET_CONTEXT/RDB$SET_CONTEXT parameters incorrectly described as CHAR NOT NULL instead of VARCHAR NULLABLE DESCRIPTION: JIRA: CORE-4156 FBTEST: bugs.core_4156 +NOTES: + [12.12.2023] pzotov + Added 'SQLSTATE' in substitutions: runtime error must not be filtered out by '?!(...)' pattern + ("negative lookahead assertion", see https://docs.python.org/3/library/re.html#regular-expression-syntax). + Added 'combine_output = True' in order to see SQLSTATE if any error occurs. """ import pytest @@ -26,7 +30,7 @@ test_script = """ -- #define SQL_LONG 496 """ -act = isql_act('db', test_script, substitutions=[('^((?!sqltype).)*$', ''), ('[ ]+', ' '), ('[\t]*', ' ')]) +act = isql_act('db', test_script, substitutions=[('^((?!(SQLSTATE|sqltype)).)*$', ''), ('[\t ]+', ' ')]) expected_stdout = """ 01: sqltype: 448 VARYING Nullable scale: 0 subtype: 0 len: 80 charset: 0 NONE @@ -38,6 +42,6 @@ expected_stdout = """ @pytest.mark.version('>=3.0') def test_1(act: Action): act.expected_stdout = expected_stdout - act.execute() + act.execute(combine_output = True) assert act.clean_stdout == act.clean_expected_stdout