diff options
Diffstat (limited to 'library/python/testing')
| -rw-r--r-- | library/python/testing/yatest_common/yatest/common/canonical.py | 6 | ||||
| -rw-r--r-- | library/python/testing/yatest_common/yatest/common/process.py | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/library/python/testing/yatest_common/yatest/common/canonical.py b/library/python/testing/yatest_common/yatest/common/canonical.py index 0bce0fde7a5..c964b076cc0 100644 --- a/library/python/testing/yatest_common/yatest/common/canonical.py +++ b/library/python/testing/yatest_common/yatest/common/canonical.py @@ -46,7 +46,7 @@ def canonical_file( try: # check if iterable if not isinstance(diff_tool[0], six.string_types): raise Exception("Invalid custom diff-tool: not cmd") - except: + except Exception: raise Exception("Invalid custom diff-tool: not binary path") return runtime._get_ya_plugin_instance().file( safe_path, diff_tool=diff_tool, local=local, diff_file_name=diff_file_name, diff_tool_timeout=diff_tool_timeout @@ -217,7 +217,9 @@ def _canonical_execute( out_file_path = path.get_unique_file_path(runtime.output_path(), "{}.out.txt".format(file_name)) err_file_path = path.get_unique_file_path(runtime.output_path(), "{}.err.txt".format(file_name)) if not data_transformer: - data_transformer = lambda x: x + + def data_transformer(x): + return x try: os.makedirs(os.path.dirname(out_file_path)) diff --git a/library/python/testing/yatest_common/yatest/common/process.py b/library/python/testing/yatest_common/yatest/common/process.py index c6c8aed5268..69988be84c5 100644 --- a/library/python/testing/yatest_common/yatest/common/process.py +++ b/library/python/testing/yatest_common/yatest/common/process.py @@ -373,7 +373,10 @@ class _Execution(object): try: if timeout: - process_is_finished = lambda: not self.running + + def process_is_finished(): + return not self.running + fail_message = "Command '%s' stopped by %d seconds timeout" % (self._command, timeout) try: wait_for( |