From e4ed4e8aa6ec45d7b3973e6a2797894acd48efd5 Mon Sep 17 00:00:00 2001 From: pavel-zotov Date: Mon, 11 Dec 2023 18:11:39 +0300 Subject: [PATCH] Added/Updated tests\bugs\core_3899_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_3899_test.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/bugs/core_3899_test.py b/tests/bugs/core_3899_test.py index 6d477270..09460cd5 100644 --- a/tests/bugs/core_3899_test.py +++ b/tests/bugs/core_3899_test.py @@ -7,6 +7,11 @@ TITLE: row_number(), rank() and dense_rank() return BIGINT datatype in dia DESCRIPTION: JIRA: CORE-3899 FBTEST: bugs.core_3899 +NOTES: + [11.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 @@ -16,15 +21,14 @@ db = db_factory(sql_dialect=1) test_script = """ set sqlda_display on; - set planonly; select row_number()over() rno, rank()over() rnk, dense_rank()over() drk - from rdb$database; + from rdb$database + rows 0; -- NB: on dialect-3 output is: -- sqltype: 580 INT64 ... """ -act = isql_act('db', test_script, substitutions=[('^((?!sqltype:|name:).)*$', ''), - ('[ ]+', ' '), ('[\t]*', ' ')]) +act = isql_act('db', test_script, substitutions=[('^((?!(SQLSTATE|sqltype:|name:)).)*$', ''), ('[ \t]+', ' ')]) expected_stdout = """ 01: sqltype: 480 DOUBLE scale: 0 subtype: 0 len: 8 @@ -38,6 +42,5 @@ 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 -