diff --git a/tests/functional/util/test_gbak_zip.py b/tests/functional/util/test_gbak_zip.py index e6ae52be..c45c63aa 100644 --- a/tests/functional/util/test_gbak_zip.py +++ b/tests/functional/util/test_gbak_zip.py @@ -26,6 +26,9 @@ NOTES: 2. Test performs TWO iterations for b/r + validation: without and with '-se localhost:service_mgr'. Checked on 5.0.0.623, 4.0.1.2692 - both on Windows and Linux. + + [25.11.2023] pzotov + Writing code requires more care since 6.0.0.150: ISQL does not allow specifying duplicate delimiters without any statements between them (two semicolon, two carets etc). """ import locale import re @@ -50,7 +53,7 @@ non_ascii_ddl = ''' set echo on; create collation "Циферки" for utf8 from unicode case insensitive 'NUMERIC-SORT=1'; - create collation "Испания" for iso8859_1 from es_es_ci_ai 'SPECIALS-FIRST=1';; + create collation "Испания" for iso8859_1 from es_es_ci_ai 'SPECIALS-FIRST=1'; commit; create domain "ИД'шники" int; @@ -188,7 +191,7 @@ tmp_file = temp_file('non_ascii_ddl.sql') def test_1(act: Action, act_res: Action, tmp_fbk: Path, tmp_res: Database, tmp_file: Path, capsys): tmp_file.write_bytes(non_ascii_ddl.encode('utf-8')) - act.isql(switches=['-q'], input_file=tmp_file, charset='utf8', io_enc = 'utf-8') + act.isql(switches=['-q'], input_file=tmp_file, charset='utf8', io_enc = 'utf-8', combine_output = True) assert act.clean_stdout.endswith('Metadata created OK.') act.reset()