Skip to content
Snippets Groups Projects
Commit 1c291ea3 authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files
parent 0a4476be
No related branches found
No related tags found
No related merge requests found
......@@ -61,7 +61,7 @@ class TestStager(TempDirectoryTestCase):
self._submit()
uploaded_file1 = self.client.put_files[0]
assert uploaded_file1[1] == "tool"
self.assertEquals(uploaded_file1[0], "%s/tool1_wrapper.py" % tool_dir)
self.assertEqual(uploaded_file1[0], "%s/tool1_wrapper.py" % tool_dir)
def test_input_extra_rewrite(self):
self.client_job_description.rewrite_paths = True
......@@ -91,7 +91,7 @@ class TestStager(TempDirectoryTestCase):
self._submit()
uploaded_file1 = self.client.put_files[0]
assert uploaded_file1[1] == "unstructured"
self.assertEquals(uploaded_file1[0], local_unstructured_file)
self.assertEqual(uploaded_file1[0], local_unstructured_file)
def test_submit_no_rewrite(self):
# Expect no rewrite of paths
......
......@@ -171,11 +171,11 @@ class BaseManagerTestCase(TestCase):
manager.launch(job_id, command)
while manager.get_status(job_id) not in ['complete', 'cancelled']:
pass
self.assertEquals(manager.stderr_contents(job_id), b'moo')
self.assertEquals(manager.stdout_contents(job_id), b'Hello World!')
self.assertEquals(manager.return_code(job_id), 0)
self.assertEqual(manager.stderr_contents(job_id), b'moo')
self.assertEqual(manager.stdout_contents(job_id), b'Hello World!')
self.assertEqual(manager.return_code(job_id), 0)
manager.clean(job_id)
self.assertEquals(len(listdir(self.staging_directory)), 0)
self.assertEqual(len(listdir(self.staging_directory)), 0)
def _test_cancelling(self, manager):
job_id = manager.setup_job("124", "tool1", "1.0.0")
......
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