diff --git a/test/client_staging_test.py b/test/client_staging_test.py index 760893c0470f566bcb8222ee8494b76d408d8a4b..8eaab8e6b17a7cbb58d0c8ac948db40449b4af3c 100644 --- a/test/client_staging_test.py +++ b/test/client_staging_test.py @@ -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 diff --git a/test/test_utils.py b/test/test_utils.py index c945df73022a42913446b170206bf0a781fb6677..30b514fdcf1b8d860ac8deaf690413801dd1e04b 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -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")