Skip to content
Snippets Groups Projects
Commit 3dcd8c2b authored by John Chilton's avatar John Chilton
Browse files

Test for default_action_type="copy" and corresponding bug fixes.

parent e75d462e
No related branches found
No related tags found
No related merge requests found
......@@ -125,7 +125,7 @@ class Client(object):
@parseJson()
def _get_output_type(self, name):
return self._raw_execute("get_output_type", {"name": name,
"job_id": self.job_id})
"job_id": self.job_id})
def fetch_output(self, path, working_directory, action='transfer'):
"""
......@@ -183,10 +183,10 @@ class Client(object):
@parseJson()
def _output_path(self, name, job_id, output_type):
self._raw_execute("output_path",
{"name": name,
"job_id": self.job_id,
"output_type": output_type})
return self._raw_execute("output_path",
{"name": name,
"job_id": self.job_id,
"output_type": output_type})
@retry()
def __raw_download_output(self, name, job_id, output_type, output_path):
......
......@@ -78,7 +78,9 @@ finally:
cleanup_job='never',
work_dir_outputs=[],
output_files=[temp_output_path])
finish_job(**finish_args)
failed = finish_job(**finish_args)
if failed:
raise Exception("Failed to finish job correctly")
#client.download_output(temp_output_path, temp_directory)
output_file = open(temp_output_path, 'r')
try:
......
......@@ -11,6 +11,9 @@ except ImportError:
class IntegrationTest(TempDirectoryTestCase):
def test_integration_copy(self):
self.__run(private_token=None, transport=None, cache=False, test_errors=False, default_file_action="copy")
def test_integration_no_transfer(self):
self.__run(private_token=None, transport=None, cache=False, test_errors=False, default_file_action="none")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment