diff options
| author | aozeritsky <aozeritsky@ydb.tech> | 2023-10-05 18:17:24 +0300 |
|---|---|---|
| committer | aozeritsky <aozeritsky@ydb.tech> | 2023-10-05 19:11:09 +0300 |
| commit | a5b6ee6f5c6eb0e19c333eb93710f043f2547c21 (patch) | |
| tree | 1a5a3a4e195b9184d85a19bed855f16f4e60f831 | |
| parent | b1fa0ecfd0896594a952c4ff4bcb2aa4a1d79af1 (diff) | |
| download | ydb-a5b6ee6f5c6eb0e19c333eb93710f043f2547c21.tar.gz | |
Remove contrib from canondata
| -rw-r--r-- | ydb/library/yql/tests/common/test_framework/yql_utils.py | 4 | ||||
| -rw-r--r-- | ydb/library/yql/tests/common/test_framework/yqlrun.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ydb/library/yql/tests/common/test_framework/yql_utils.py b/ydb/library/yql/tests/common/test_framework/yql_utils.py index 5c37c63dba..eb67d9719f 100644 --- a/ydb/library/yql/tests/common/test_framework/yql_utils.py +++ b/ydb/library/yql/tests/common/test_framework/yql_utils.py @@ -793,7 +793,9 @@ def normalize_table_yson(y): return y -def hide_source_line_number(s): +def normalize_source_code_path(s): + # remove contrib/ + s = re.sub(r'\b(contrib/)(ydb/library/yql.*)', r'\2', s) # replace line number in source code with 'xxx' s = re.sub(r'\b(yql/[\w/]+(?:\.cpp|\.h)):(?:\d+)', r'\1:xxx', s) return re.sub(r'(/lib/yql/[\w/]+(?:\.yql|\.sql)):(?:\d+):(?:\d+)', r'\1:xxx:yyy', s) diff --git a/ydb/library/yql/tests/common/test_framework/yqlrun.py b/ydb/library/yql/tests/common/test_framework/yqlrun.py index d4fad182c3..dffb5dfcd2 100644 --- a/ydb/library/yql/tests/common/test_framework/yqlrun.py +++ b/ydb/library/yql/tests/common/test_framework/yqlrun.py @@ -303,7 +303,7 @@ class YQLRun(object): return yql_utils.YQLExecResult( proc_result.std_out, - yql_utils.hide_source_line_number(err.replace(res_dir, '<tmp_path>')), + yql_utils.normalize_source_code_path(err.replace(res_dir, '<tmp_path>')), results, results_file, opt, |