diff options
author | sobols <sobols@yandex-team.ru> | 2022-02-10 16:47:08 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:08 +0300 |
commit | 03335cb18337a0ef51966452a66a69b01abea218 (patch) | |
tree | b83306b6e37edeea782e9eed673d89286c4fef35 /library/python/pytest | |
parent | 09961b69c61f471ddd594e0fd877df62a8021562 (diff) | |
download | ydb-03335cb18337a0ef51966452a66a69b01abea218.tar.gz |
Restoring authorship annotation for <sobols@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/python/pytest')
-rw-r--r-- | library/python/pytest/plugins/collection.py | 4 | ||||
-rw-r--r-- | library/python/pytest/yatest_tools.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/library/python/pytest/plugins/collection.py b/library/python/pytest/plugins/collection.py index f49c675d36..e36f47a78f 100644 --- a/library/python/pytest/plugins/collection.py +++ b/library/python/pytest/plugins/collection.py @@ -85,8 +85,8 @@ def pytest_ignore_collect(module, session, filenames_from_full_filters, accept_f if filenames_from_full_filters is not None and module.name not in filenames_from_full_filters: return True - test_file_filter = getattr(session.config.option, 'test_file_filter', None) - if test_file_filter is None: + test_file_filter = getattr(session.config.option, 'test_file_filter', None) + if test_file_filter is None: return False if module.name != test_file_filter.replace('/', '.'): return True diff --git a/library/python/pytest/yatest_tools.py b/library/python/pytest/yatest_tools.py index 7b37688fd4..6b8b896394 100644 --- a/library/python/pytest/yatest_tools.py +++ b/library/python/pytest/yatest_tools.py @@ -210,8 +210,8 @@ def get_unique_file_path(dir_path, filename, cache=collections.defaultdict(set)) max_path = 260 filename_len = len(dir_path) + len(extension) + tail_length + len(os.sep) if filename_len < max_path: - filename = yatest_lib.tools.trim_string(filename, max_path - filename_len) - filename = yatest_lib.tools.trim_string(filename, get_max_filename_length(dir_path) - tail_length - len(extension)) + extension + filename = yatest_lib.tools.trim_string(filename, max_path - filename_len) + filename = yatest_lib.tools.trim_string(filename, get_max_filename_length(dir_path) - tail_length - len(extension)) + extension candidate = os.path.join(dir_path, filename) key = dir_path + filename |