diff --git a/pulsar/client/client.py b/pulsar/client/client.py index 5bcd21feeff2b04e9e919ed7135c3a5be563f3c9..32e3605d375826e32edc8d197c8cde4eae5bd3f3 100644 --- a/pulsar/client/client.py +++ b/pulsar/client/client.py @@ -178,10 +178,14 @@ class JobClient(BaseJobClient): if action_type in ['transfer', 'message']: if isinstance(contents, string_types): contents = contents.encode("utf-8") + message = "Uplodaing path [%s] (action_type: [%s])" + log.debug(message, path, action_type) return self._upload_file(args, contents, input_path) elif action_type == 'copy': path_response = self._raw_execute('path', args) pulsar_path = json_loads(path_response)['path'] + message = "Copying path [%s] to [%s]" + log.debug(message, path, pulsar_path) copy(path, pulsar_path) return {'path': pulsar_path} diff --git a/pulsar/managers/util/cli/shell/local.py b/pulsar/managers/util/cli/shell/local.py index 9fc5904e80bf60431dd99024ec3ba38ea701ad99..9866e839b81ebbeff4584f39243fa84a9eabff95 100644 --- a/pulsar/managers/util/cli/shell/local.py +++ b/pulsar/managers/util/cli/shell/local.py @@ -24,7 +24,7 @@ class LocalShell(BaseShellExec): True >>> exec_result.stdout.strip() == u'Hello World' True - >>> exec_result = exec_python("import time; time.sleep(90)", timeout=1, timeout_check_interval=.1) + >>> exec_result = exec_python("import time; time.sleep(90)", timeout=.3, timeout_check_interval=.1) >>> exec_result.stdout == u'' True >>> exec_result.stderr == 'Execution timed out'