firebird/firebird-qa
6
0
Fork 0
mirror of https://github.com/FirebirdSQL/firebird-qa.git synced 2025-01-22 13:33:07 +01:00
Code Issues Activity

Adjustments for v0.12.1

Browse Source
This commit is contained in:
Pavel Císař 2022-02-24 19:21:22 +01:00
parent 84caa5a270
commit da0ffc3cae
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/bugs/core_0959_test.py
View File

@ -67,7 +67,7 @@ def test_1(act: Action):
matched.append(' '.join(line.replace('%','[percent_sign]').split()))
#
actual = '\n'.join(matched)
actual = act.string_strip(actual, act.substitutions)
actual = act.clean_string(actual, act.substitutions)
assert ('localhost' in act.db.dsn and act.clean_expected_stdout == actual)

4
tests/bugs/core_1746_test.py
View File

@ -252,12 +252,12 @@ def test_1(act: Action, tmp_file_bi_in: Path, tmp_file_bi_out: Path, capsys):
bulk_insert_log = tmp_file_bi_out.read_text()
create_indx_log = act.stdout + act.stderr
log = act.string_strip(bulk_insert_log, act.substitutions)
log = act.clean_string(bulk_insert_log, act.substitutions)
for line in log.splitlines():
if line.strip():
print( str(i)+': BULK INSERTS LOG: '+line.strip().upper() )
log = act.string_strip(create_indx_log, act.substitutions)
log = act.clean_string(create_indx_log, act.substitutions)
for line in log.splitlines():
if line.strip():
print( str(i)+': CREATE INDEX LOG: '+line.strip().upper() )

14
tests/bugs/core_2940_test.py
View File

@ -45,13 +45,13 @@ test_script = """
"""
trace = ['log_connections = true',
'log_transactions = true',
'log_statement_finish = true',
'print_plan = true',
'print_perf = true',
'time_threshold = 0',
'exclude_filter = %no_trace%',
]
'log_transactions = true',
'log_statement_finish = true',
'print_plan = true',
'print_perf = true',
'time_threshold = 0',
'exclude_filter = %no_trace%',
]
@pytest.mark.skipif(platform.system() == 'Windows', reason='FIXME: see notes')
@pytest.mark.version('>=3.0')

4
tests/bugs/core_3977_test.py
View File

@ -94,7 +94,7 @@ def test_1(act: Action, work_script_1: Path, capsys):
"""
try:
act.isql(switches=[], input=drop_sql)
delete_from_mon_sttm_log = act.string_strip(act.stdout)
delete_from_mon_sttm_log = act.clean_string(act.stdout)
finally:
p_work_sql.terminate()
# Run checking query: what is resuling value of sequence 'g' ?
@ -118,7 +118,7 @@ def test_1(act: Action, work_script_1: Path, capsys):
for line in delete_from_mon_sttm_log.splitlines():
if not 'EXECUTE STATEMENT' in line.upper():
print('DEL FROM MON$STTM: ', ' '.join(line.upper().split()))
for line in act.string_strip(act.stdout).splitlines():
for line in act.clean_string(act.stdout).splitlines():
print('CHECK RESULTS LOG: ', ' '.join(line.upper().split()))
#
act.expected_stdout = expected_stdout

4
tests/bugs/core_5275_test.py
View File

@ -248,13 +248,13 @@ def test_1(act: Action, bulk_insert_script: Path, bulk_insert_output: Path,
finally:
p_bulk_insert.terminate()
# Print logs
for line in act.string_strip(bulk_insert_output.read_text()).splitlines():
for line in act.clean_string(bulk_insert_output.read_text()).splitlines():
if line:
print(f'{step}: BULK INSERTS LOG: {line.strip().upper()}')
for line in create_idx_output.read_text().splitlines():
if line:
print(f'{step}: CREATE INDEX LOG: {line.strip().upper()}')
for line in act.string_strip(act.stdout).splitlines():
for line in act.clean_string(act.stdout).splitlines():
if line:
print(f'{step}: KILL ATTACH LOG: {line.strip().upper()}')
# Get Firebird log after test

2
tests/bugs/core_5685_test.py
View File

@ -190,7 +190,7 @@ def test_1(act: Action, hang_script: Path, hang_stdout: Path, hang_stderr: Path,
msg = line
output.append(f'HANGED ATTACH, STDERR: {msg}')
for step in killer_output:
for line in act.string_strip(step).splitlines():
for line in act.clean_string(step).splitlines():
if line.strip():
output.append(f"KILLER ATTACH, STDOUT: {' '.join(line.split())}")
# Check