diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5984e842..d3c6c1fc 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -28,6 +28,7 @@ Changed - Upgrade to django-sodar-core v1.0.2 (#1922) - Upgrade to Postgres v16 (#1922) - Upgrade Python and Vue app dependencies (#1922, #1959) + - Unify base test class naming (#2001) - **Irodsinfo** - Update REST API versioning (#1936) - **Landingzones** @@ -37,6 +38,8 @@ Changed - Update REST API versioning (#1936) - Update REST API views for OpenAPI compatibility (#1951) - Send iRODS delete request emails to all addresses of user (#2000) +- **Taskflowbackend** + - Refactor task tests (#2002) Removed ------- diff --git a/irodsinfo/tests/test_views.py b/irodsinfo/tests/test_views.py index 327654d8..4da7ab77 100644 --- a/irodsinfo/tests/test_views.py +++ b/irodsinfo/tests/test_views.py @@ -20,7 +20,7 @@ PLUGINS_DISABLE_IRODS.remove('omics_irods') -class TestIrodsinfoViewBase(TestCase): +class IrodsinfoViewTestBase(TestCase): """Base class for irodsinfo view tests""" def setUp(self): @@ -33,7 +33,7 @@ def setUp(self): self.anonymous = None -class TestIrodsInfoView(TestIrodsinfoViewBase): +class TestIrodsInfoView(IrodsinfoViewTestBase): """Tests for IrodsInfoView""" def test_render(self): @@ -52,7 +52,7 @@ def test_render_no_backend(self): self.assertFalse(response.context['irods_backend_enabled']) -class TestIrodsConfigView(TestIrodsinfoViewBase): +class TestIrodsConfigView(IrodsinfoViewTestBase): """Tests for IrodsConfigView""" def test_serve(self): diff --git a/landingzones/tests/test_tasks_taskflow.py b/landingzones/tests/test_tasks_taskflow.py index bb2fb753..b67a1996 100644 --- a/landingzones/tests/test_tasks_taskflow.py +++ b/landingzones/tests/test_tasks_taskflow.py @@ -13,7 +13,7 @@ import landingzones.constants as lc from landingzones.tasks_taskflow import SetLandingZoneStatusTask -from landingzones.tests.test_views import TestViewsBase +from landingzones.tests.test_views import ViewTestBase app_settings = AppSettingAPI() @@ -24,7 +24,7 @@ TASK_NAME = 'set landing zone status' -class TestSetLandingZoneStatusTask(TestViewsBase): +class TestSetLandingZoneStatusTask(ViewTestBase): """Tests for SetLandingZoneStatusTask""" def _get_task(self, force_fail=False): diff --git a/landingzones/tests/test_views.py b/landingzones/tests/test_views.py index c0e59224..6e7ae23b 100644 --- a/landingzones/tests/test_views.py +++ b/landingzones/tests/test_views.py @@ -39,7 +39,7 @@ ZONE_STATUS_INFO = 'Testing' -class TestViewsBase( +class ViewTestBase( ProjectMixin, RoleMixin, RoleAssignmentMixin, @@ -47,7 +47,7 @@ class TestViewsBase( LandingZoneMixin, TestCase, ): - """Base class for view testing""" + """Base class for landingzones view testing""" def setUp(self): # Init roles @@ -83,7 +83,7 @@ def setUp(self): ) -class TestProjectZonesView(TestViewsBase): +class TestProjectZonesView(ViewTestBase): """Tests for the project zones list view""" def test_render_owner(self): @@ -143,7 +143,7 @@ def test_render_disable_superuser(self): self.assertEqual(response.context['zone_access_disabled'], False) -class TestLandingZoneCreateView(TestViewsBase): +class TestLandingZoneCreateView(ViewTestBase): """Tests for the landing zone creation view""" def test_render(self): @@ -165,7 +165,7 @@ def test_render(self): self.assertIsNotNone(form.fields['configuration']) -class TestLandingZoneUpdateView(TestViewsBase): +class TestLandingZoneUpdateView(ViewTestBase): """Tests for the landing zone update view""" def test_render(self): @@ -255,7 +255,7 @@ def test_post_invalid_data(self): self.assertEqual(landing_zone.description, 'description') -class TestLandingZoneMoveView(TestViewsBase): +class TestLandingZoneMoveView(ViewTestBase): """Tests for the landing zone validation and moving view""" def test_render_invalid_status(self): @@ -273,7 +273,7 @@ def test_render_invalid_status(self): self.assertEqual(response.status_code, 302) -class TestLandingZoneDeleteView(TestViewsBase): +class TestLandingZoneDeleteView(ViewTestBase): """Tests for the landing zone deletion view""" def test_render(self): diff --git a/landingzones/tests/test_views_ajax.py b/landingzones/tests/test_views_ajax.py index 396cacbc..3035d581 100644 --- a/landingzones/tests/test_views_ajax.py +++ b/landingzones/tests/test_views_ajax.py @@ -2,10 +2,10 @@ from django.urls import reverse -from landingzones.tests.test_views import TestViewsBase +from landingzones.tests.test_views import ViewTestBase -class TestLandingZoneStatusGetAjaxView(TestViewsBase): +class TestLandingZoneStatusGetAjaxView(ViewTestBase): """Tests for the landing zone status getting Ajax view""" def test_post(self): diff --git a/landingzones/tests/test_views_api.py b/landingzones/tests/test_views_api.py index d81548a9..81ccb1f8 100644 --- a/landingzones/tests/test_views_api.py +++ b/landingzones/tests/test_views_api.py @@ -41,7 +41,7 @@ INVALID_UUID = '11111111-1111-1111-1111-111111111111' -class TestLandingZoneAPIViewsBase( +class LandingZoneAPIViewTestBase( LandingZoneMixin, SampleSheetIOMixin, APIViewTestBase ): """Base class for Landingzones API view testing""" @@ -71,7 +71,7 @@ def setUp(self): ) -class TestLandingZoneListAPIView(TestLandingZoneAPIViewsBase): +class TestLandingZoneListAPIView(LandingZoneAPIViewTestBase): """Tests for LandingZoneListAPIView""" def setUp(self): @@ -198,7 +198,7 @@ def test_get_finished_true(self): self.assertEqual(len(response.data), 2) -class TestLandingZoneRetrieveAPIView(TestLandingZoneAPIViewsBase): +class TestLandingZoneRetrieveAPIView(LandingZoneAPIViewTestBase): """Tests for LandingZoneRetrieveAPIView""" def test_get(self): @@ -242,7 +242,7 @@ def test_get_locked(self): self.assertEqual(json.loads(response.content)['status_locked'], True) -class TestLandingZoneUpdateAPIView(TestLandingZoneAPIViewsBase): +class TestLandingZoneUpdateAPIView(LandingZoneAPIViewTestBase): """Tests for LandingZoneUpdateAPIView""" def setUp(self): diff --git a/samplesheets/studyapps/tests/test_utils.py b/samplesheets/studyapps/tests/test_utils.py index 57f1a772..35ddbf4b 100644 --- a/samplesheets/studyapps/tests/test_utils.py +++ b/samplesheets/studyapps/tests/test_utils.py @@ -30,7 +30,7 @@ INVALID_FILE_TYPE = 'INVALID_TYPE' -class TestStudyAppUtilsBase( +class StudyAppUtilsTestBase( ProjectMixin, RoleAssignmentMixin, SampleSheetIOMixin, TestCase ): """Base class for samplesheets study app utils tests""" @@ -50,7 +50,7 @@ def setUp(self): ) -class TestGetIGVOmitList(TestStudyAppUtilsBase): +class TestGetIGVOmitList(StudyAppUtilsTestBase): """Tests for get_igv_omit_list()""" def test_get(self): @@ -206,7 +206,7 @@ def test_path_omit_collections_middle(self): self.assertFalse(check_igv_file_path(path, omit_list)) -class TestGetIGVXML(TestStudyAppUtilsBase): +class TestGetIGVXML(StudyAppUtilsTestBase): """Tests for get_igv_xml()""" def _get_all_paths(self): diff --git a/samplesheets/tests/test_views_api_taskflow.py b/samplesheets/tests/test_views_api_taskflow.py index 841331aa..baa165be 100644 --- a/samplesheets/tests/test_views_api_taskflow.py +++ b/samplesheets/tests/test_views_api_taskflow.py @@ -173,7 +173,7 @@ def setUp(self): self.app_alert_model = self.app_alerts.get_model() -class TestIrodsDataRequestAPIViewBase( +class IrodsDataRequestAPIViewTestBase( SampleSheetIOMixin, SampleSheetTaskflowMixin, TaskflowAPIViewTestBase ): """Base samplesheets API view test class for iRODS delete requests""" @@ -734,7 +734,7 @@ def test_delete_invalid_url(self): # NOTE: For TestIrodsDataRequestListAPIView, see test_views_api -class TestIrodsDataRequestCreateAPIView(TestIrodsDataRequestAPIViewBase): +class TestIrodsDataRequestCreateAPIView(IrodsDataRequestAPIViewTestBase): """Tests for IrodsDataRequestCreateAPIView""" def test_create(self): @@ -835,7 +835,7 @@ def test_create_multiple(self): class TestIrodsDataRequestUpdateAPIView( - IrodsDataRequestMixin, TestIrodsDataRequestAPIViewBase + IrodsDataRequestMixin, IrodsDataRequestAPIViewTestBase ): """Tests for IrodsDataRequestUpdateAPIView""" @@ -957,7 +957,7 @@ def test_patch_superuser(self): class TestIrodsDataRequestAcceptAPIView( - IrodsDataRequestMixin, TestIrodsDataRequestAPIViewBase + IrodsDataRequestMixin, IrodsDataRequestAPIViewTestBase ): """Tests for IrodsDataRequestAcceptAPIView""" @@ -1060,7 +1060,7 @@ def test_accept_already_accepted(self): class TestIrodsDataRequestRejectAPIView( - IrodsDataRequestMixin, TestIrodsDataRequestAPIViewBase + IrodsDataRequestMixin, IrodsDataRequestAPIViewTestBase ): """Tests for IrodsDataRequestRejectAPIView""" diff --git a/samplesheets/tests/test_views_taskflow.py b/samplesheets/tests/test_views_taskflow.py index b14d7aba..b07ab03e 100644 --- a/samplesheets/tests/test_views_taskflow.py +++ b/samplesheets/tests/test_views_taskflow.py @@ -1900,6 +1900,12 @@ class TestIrodsDataRequestAcceptBatchView( ): """Tests for IrodsDataRequestAcceptBatchView""" + @classmethod + def _get_request_uuids(cls): + return ','.join( + [str(r.sodar_uuid) for r in IrodsDataRequest.objects.all()] + ) + def setUp(self): super().setUp() self.create_url = reverse( @@ -1910,6 +1916,10 @@ def setUp(self): 'samplesheets:irods_request_accept_batch', kwargs={'project': self.project.sodar_uuid}, ) + self.list_url = reverse( + 'samplesheets:irods_requests', + kwargs={'project': self.project.sodar_uuid}, + ) def test_get(self): """Test IrodsDataRequestAcceptBatchView GET""" @@ -1932,27 +1942,12 @@ def test_get(self): with self.login(self.user): response = self.client.post( - self.accept_url, - { - 'irods_requests': ','.join( - [ - str(irods_request.sodar_uuid) - for irods_request in IrodsDataRequest.objects.all() - ] - ), - }, + self.accept_url, {'irods_requests': self._get_request_uuids()} ) self.assertEqual(response.status_code, 200) + paths = [r.path for r in IrodsDataRequest.objects.all()] self.assertEqual( - response.context['affected_object_paths'], - sorted( - set( - [ - irods_request.path - for irods_request in IrodsDataRequest.objects.all() - ] - ) - ), + response.context['affected_object_paths'], sorted(set(paths)) ) self.assertEqual(len(response.context['request_objects']), 2) self.assertEqual( @@ -1981,14 +1976,7 @@ def test_get_coll(self): with self.login(self.user): response = self.client.post( self.accept_url, - { - 'irods_requests': ','.join( - [ - str(irods_request.sodar_uuid) - for irods_request in IrodsDataRequest.objects.all() - ] - ), - }, + {'irods_requests': self._get_request_uuids()}, ) self.assertEqual(response.status_code, 200) self.assertEqual( @@ -2007,10 +1995,7 @@ def test_post(self): with self.login(self.user_contributor): self.client.post(self.create_url, self.post_data) self.client.post( - reverse( - 'samplesheets:irods_request_create', - kwargs={'project': self.project.sodar_uuid}, - ), + self.create_url, self.post_data2, ) @@ -2024,23 +2009,12 @@ def test_post(self): response = self.client.post( self.accept_url, { - 'irods_requests': ','.join( - [ - str(irods_request.sodar_uuid) - for irods_request in IrodsDataRequest.objects.all() - ] - ) + 'irods_requests': self._get_request_uuids() + ',', # Add trailing comma to test for correct splitting 'confirm': True, }, ) - self.assertRedirects( - response, - reverse( - 'samplesheets:irods_requests', - kwargs={'project': self.project.sodar_uuid}, - ), - ) + self.assertRedirects(response, self.list_url) self.assertEqual(len(list(get_messages(response.wsgi_request))), 2) self.assertEqual( list(get_messages(response.wsgi_request))[-1].message, @@ -2104,12 +2078,7 @@ def test_post_invalid_data(self): response = self.client.post( self.accept_url, { - 'irods_requests': ','.join( - [ - str(irods_request.sodar_uuid) - for irods_request in IrodsDataRequest.objects.all() - ] - ) + 'irods_requests': self._get_request_uuids() + ',', # Add trailing comma to test for correct splitting 'confirm': False, }, @@ -2147,23 +2116,12 @@ def test_post_lock_failure(self): response = self.client.post( self.accept_url, { - 'irods_requests': ','.join( - [ - str(irods_request.sodar_uuid) - for irods_request in IrodsDataRequest.objects.all() - ] - ) + 'irods_requests': self._get_request_uuids() + ',', # Add trailing comma to test for correct splitting 'confirm': True, }, ) - self.assertRedirects( - response, - reverse( - 'samplesheets:irods_requests', - kwargs={'project': self.project.sodar_uuid}, - ), - ) + self.assertRedirects(response, self.list_url) obj = IrodsDataRequest.objects.first() obj.refresh_from_db() self.assertEqual(obj.status, IRODS_REQUEST_STATUS_FAILED) diff --git a/taskflowbackend/tests/test_tasks.py b/taskflowbackend/tests/test_tasks.py index ab72a2f0..531e5a73 100644 --- a/taskflowbackend/tests/test_tasks.py +++ b/taskflowbackend/tests/test_tasks.py @@ -59,10 +59,10 @@ class IRODSTaskTestBase(TaskflowViewTestBase): """Base test class for iRODS tasks""" - def _run_flow(self): + def run_flow(self): return self.flow.run(verbose=False) - def _init_flow(self): + def init_flow(self): return BaseLinearFlow( irods_backend=self.irods_backend, project=self.project, @@ -70,7 +70,7 @@ def _init_flow(self): flow_data={}, ) - def _add_task(self, cls, name, inject, force_fail=False): + def add_task(self, cls, name, inject, force_fail=False): self.flow.add_task( cls( name=name, @@ -81,10 +81,10 @@ def _add_task(self, cls, name, inject, force_fail=False): ) ) - def _get_test_coll(self): + def get_test_coll(self): return self.irods.collections.get(self.test_coll_path) - def _get_user_access(self, target, user_name): + def get_user_access(self, target, user_name): # target_access = self.irods.acls.get(target=target) # 2.0+ target_access = self.irods.permissions.get(target=target) return next( @@ -109,7 +109,7 @@ def setUp(self): self.test_coll_path = self.test_coll.path self.new_coll_path = os.path.join(self.project_path, NEW_COLL_NAME) # Init flow - self.flow = self._init_flow() + self.flow = self.init_flow() class TestCreateCollectionTask(IRODSTaskTestBase): @@ -118,32 +118,32 @@ class TestCreateCollectionTask(IRODSTaskTestBase): def test_execute(self): """Test collection creation""" self.assertFalse(self.irods.collections.exists(self.new_coll_path)) - self._add_task( + self.add_task( cls=CreateCollectionTask, name='Create collection', inject={'path': self.new_coll_path}, ) - result = self._run_flow() + result = self.run_flow() self.assertTrue(result) self.assertTrue(self.irods.collections.exists(self.new_coll_path)) def test_execute_twice(self): """Test collection creation twice""" self.assertFalse(self.irods.collections.exists(self.new_coll_path)) - self._add_task( + self.add_task( cls=CreateCollectionTask, name='Create collection', inject={'path': self.new_coll_path}, ) - self._run_flow() + self.run_flow() self.assertTrue(self.irods.collections.exists(self.new_coll_path)) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=CreateCollectionTask, name='Create collection', inject={'path': self.new_coll_path}, ) - result = self._run_flow() + result = self.run_flow() self.assertTrue(result) self.assertTrue(self.irods.collections.exists(self.new_coll_path)) @@ -151,13 +151,13 @@ def test_revert_created(self): """Test collection creation reverting after creating""" self.assertFalse(self.irods.collections.exists(self.new_coll_path)) self.assertTrue(self.irods.collections.exists(self.test_coll_path)) - self._add_task( + self.add_task( cls=CreateCollectionTask, name='Create collection', inject={'path': self.new_coll_path}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertFalse(result) self.assertFalse(self.irods.collections.exists(self.new_coll_path)) self.assertTrue(self.irods.collections.exists(self.test_coll_path)) @@ -166,23 +166,23 @@ def test_revert_not_modified(self): """Test collection creation reverting without modification""" self.assertFalse(self.irods.collections.exists(self.new_coll_path)) self.assertTrue(self.irods.collections.exists(self.test_coll_path)) - self._add_task( + self.add_task( cls=CreateCollectionTask, name='Create collection', inject={'path': self.new_coll_path}, ) - result = self._run_flow() + result = self.run_flow() self.assertTrue(result) self.assertTrue(self.irods.collections.exists(self.new_coll_path)) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=CreateCollectionTask, name='Create collection', inject={'path': self.new_coll_path}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertFalse(result) self.assertTrue(self.irods.collections.exists(self.new_coll_path)) self.assertTrue(self.irods.collections.exists(self.test_coll_path)) @@ -202,7 +202,7 @@ def test_execute_nested(self): ) self.assertTrue(self.irods.collections.exists(self.test_coll_path)) - self._add_task( + self.add_task( cls=CreateCollectionTask, name='Create collection', inject={ @@ -224,7 +224,7 @@ def test_execute_nested(self): self.irods.collections.get, os.path.join(self.new_coll_path, 'subcoll1', 'subcoll2'), ) - result = self._run_flow() + result = self.run_flow() self.assertTrue(result) self.assertTrue(self.irods.collections.exists(self.new_coll_path)) @@ -255,14 +255,14 @@ def test_execute_nested_twice(self): ) self.assertTrue(self.irods.collections.exists(self.test_coll_path)) - self._add_task( + self.add_task( cls=CreateCollectionTask, name='Create collection', inject={ 'path': os.path.join(self.new_coll_path, 'subcoll1', 'subcoll2') }, ) - result = self._run_flow() + result = self.run_flow() self.assertTrue(result) self.assertTrue(self.irods.collections.exists(self.new_coll_path)) @@ -278,15 +278,15 @@ def test_execute_nested_twice(self): ) self.assertTrue(self.irods.collections.exists(self.test_coll_path)) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=CreateCollectionTask, name='Create collection', inject={ 'path': os.path.join(self.new_coll_path, 'subcoll1', 'subcoll2') }, ) - result = self._run_flow() + result = self.run_flow() self.assertTrue(result) self.assertTrue(self.irods.collections.exists(self.new_coll_path)) @@ -317,7 +317,7 @@ def test_revert_created_nested(self): ) self.assertTrue(self.irods.collections.exists(self.test_coll_path)) - self._add_task( + self.add_task( cls=CreateCollectionTask, name='Create collection', inject={ @@ -325,7 +325,7 @@ def test_revert_created_nested(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertFalse(result) self.assertFalse(self.irods.collections.exists(self.new_coll_path)) @@ -347,7 +347,7 @@ class TestRemoveCollectionTask(IRODSTaskTestBase): def test_execute(self): """Test collection removal""" - self._add_task( + self.add_task( cls=RemoveCollectionTask, name='Remove collection', inject={'path': self.test_coll_path}, @@ -355,7 +355,7 @@ def test_execute(self): coll = self.irods.collections.get(self.test_coll_path) self.assertIsInstance(coll, iRODSCollection) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertRaises( @@ -366,20 +366,20 @@ def test_execute(self): def test_execute_twice(self): """Test collection removal twice""" - self._add_task( + self.add_task( cls=RemoveCollectionTask, name='Remove collection', inject={'path': self.test_coll_path}, ) - self._run_flow() + self.run_flow() - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=RemoveCollectionTask, name='Remove collection', inject={'path': self.test_coll_path}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertRaises( @@ -390,13 +390,13 @@ def test_execute_twice(self): def test_revert_removed(self): """Test collection removal reverting after removing""" - self._add_task( + self.add_task( cls=RemoveCollectionTask, name='Remove collection', inject={'path': self.test_coll_path}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) coll = self.irods.collections.get(self.test_coll_path) @@ -409,14 +409,14 @@ def test_revert_not_modified(self): self.irods.collections.get, self.new_coll_path, ) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=RemoveCollectionTask, name='Remove collection', inject={'path': self.new_coll_path}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) self.assertRaises( @@ -437,14 +437,14 @@ def setUp(self): def test_execute(self): """Test data object removal""" - self._add_task( + self.add_task( cls=RemoveDataObjectTask, name='Remove data object', inject={'path': self.obj_path}, ) obj = self.irods.data_objects.get(self.obj_path) self.assertIsInstance(obj, iRODSDataObject) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) with self.assertRaises(DataObjectDoesNotExist): @@ -452,20 +452,20 @@ def test_execute(self): def test_execute_twice(self): """Test data object removal twice""" - self._add_task( + self.add_task( cls=RemoveDataObjectTask, name='Remove data object', inject={'path': self.obj_path}, ) - self._run_flow() + self.run_flow() - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=RemoveDataObjectTask, name='Remove data_object', inject={'path': self.obj_path}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) with self.assertRaises(DataObjectDoesNotExist): @@ -473,13 +473,13 @@ def test_execute_twice(self): def test_revert_removed(self): """Test data object removal reverting after removing""" - self._add_task( + self.add_task( cls=RemoveDataObjectTask, name='Remove data_object', inject={'path': self.obj_path}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) obj = self.irods.data_objects.get(self.obj_path) @@ -491,14 +491,14 @@ def test_revert_not_modified(self): with self.assertRaises(DataObjectDoesNotExist): self.irods.data_objects.get(obj_path2) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=RemoveDataObjectTask, name='Remove data object', inject={'path': obj_path2}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) with self.assertRaises(DataObjectDoesNotExist): @@ -510,7 +510,7 @@ class TestSetCollectionMetadataTask(IRODSTaskTestBase): def test_execute(self): """Test setting metadata""" - self._add_task( + self.add_task( cls=SetCollectionMetadataTask, name='Set metadata', inject={ @@ -520,13 +520,13 @@ def test_execute(self): 'units': TEST_UNITS, }, ) - test_coll = self._get_test_coll() + test_coll = self.get_test_coll() self.assertRaises(Exception, test_coll.metadata.get_one, TEST_KEY) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) # NOTE: We must retrieve collection again to refresh its metadata - test_coll = self._get_test_coll() + test_coll = self.get_test_coll() meta_item = test_coll.metadata.get_one(TEST_KEY) self.assertIsInstance(meta_item, iRODSMeta) self.assertEqual(meta_item.name, TEST_KEY) @@ -535,7 +535,7 @@ def test_execute(self): def test_execute_twice(self): """Test setting metadata twice""" - self._add_task( + self.add_task( cls=SetCollectionMetadataTask, name='Set metadata', inject={ @@ -545,10 +545,10 @@ def test_execute_twice(self): 'units': TEST_UNITS, }, ) - self._run_flow() + self.run_flow() - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=SetCollectionMetadataTask, name='Set metadata', inject={ @@ -558,16 +558,16 @@ def test_execute_twice(self): 'units': TEST_UNITS, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - test_coll = self._get_test_coll() + test_coll = self.get_test_coll() meta_item = test_coll.metadata.get_one(TEST_KEY) self.assertIsInstance(meta_item, iRODSMeta) def test_revert_created(self): """Test metadata setting reverting after creating a new item""" - self._add_task( + self.add_task( cls=SetCollectionMetadataTask, name='Set metadata', inject={ @@ -578,15 +578,15 @@ def test_revert_created(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) - test_coll = self._get_test_coll() + test_coll = self.get_test_coll() self.assertRaises(KeyError, test_coll.metadata.get_one, TEST_KEY) def test_revert_modified(self): """Test metadata setting reverting after modification""" - self._add_task( + self.add_task( cls=SetCollectionMetadataTask, name='Set metadata', inject={ @@ -596,11 +596,11 @@ def test_revert_modified(self): 'units': TEST_UNITS, }, ) - self._run_flow() + self.run_flow() - self.flow = self._init_flow() + self.flow = self.init_flow() new_val = 'new value' - self._add_task( + self.add_task( cls=SetCollectionMetadataTask, name='Set metadata', inject={ @@ -611,17 +611,17 @@ def test_revert_modified(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) - test_coll = self._get_test_coll() + test_coll = self.get_test_coll() meta_item = test_coll.metadata.get_one(TEST_KEY) self.assertIsInstance(meta_item, iRODSMeta) self.assertEqual(meta_item.value, TEST_VAL) # Original value def test_revert_not_modified(self): """Test metadata setting reverting without modification""" - self._add_task( + self.add_task( cls=SetCollectionMetadataTask, name='Set metadata', inject={ @@ -631,11 +631,11 @@ def test_revert_not_modified(self): 'units': TEST_UNITS, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=SetCollectionMetadataTask, name='Set metadata', inject={ @@ -646,15 +646,15 @@ def test_revert_not_modified(self): }, force_fail=True, ) - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) - test_coll = self._get_test_coll() + test_coll = self.get_test_coll() self.assertIsInstance(test_coll, iRODSCollection) def test_execute_empty(self): """Test setting an empty value for metadata""" - self._add_task( + self.add_task( cls=SetCollectionMetadataTask, name='Set metadata', inject={ @@ -664,12 +664,12 @@ def test_execute_empty(self): 'units': TEST_UNITS, }, ) - test_coll = self._get_test_coll() + test_coll = self.get_test_coll() self.assertRaises(Exception, test_coll.metadata.get_one, TEST_KEY) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - test_coll = self._get_test_coll() + test_coll = self.get_test_coll() meta_item = test_coll.metadata.get_one(TEST_KEY) self.assertIsInstance(meta_item, iRODSMeta) self.assertEqual(meta_item.name, TEST_KEY) @@ -682,7 +682,7 @@ class TestCreateUserGroupTask(IRODSTaskTestBase): def test_execute(self): """Test user group creation""" - self._add_task( + self.add_task( cls=CreateUserGroupTask, name='Create user group', inject={'name': TEST_USER_GROUP}, @@ -692,7 +692,7 @@ def test_execute(self): self.irods.user_groups.get, TEST_USER_GROUP, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) group = self.irods.user_groups.get(TEST_USER_GROUP) @@ -700,21 +700,21 @@ def test_execute(self): def test_execute_twice(self): """Test user group creation twice""" - self._add_task( + self.add_task( cls=CreateUserGroupTask, name='Create user group', inject={'name': TEST_USER_GROUP}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=CreateUserGroupTask, name='Create user group', inject={'name': TEST_USER_GROUP}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) group = self.irods.user_groups.get(TEST_USER_GROUP) @@ -722,13 +722,13 @@ def test_execute_twice(self): def test_revert_created(self): """Test collection creation reverting after creation""" - self._add_task( + self.add_task( cls=CreateUserGroupTask, name='Create user group', inject={'name': TEST_USER_GROUP}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) self.assertRaises( @@ -739,22 +739,22 @@ def test_revert_created(self): def test_revert_not_modified(self): """Test collection creation reverting without modification""" - self._add_task( + self.add_task( cls=CreateUserGroupTask, name='Create user group', inject={'name': TEST_USER_GROUP}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=CreateUserGroupTask, name='Create user group', inject={'name': TEST_USER_GROUP}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) group = self.irods.user_groups.get(TEST_USER_GROUP) @@ -773,7 +773,7 @@ def setUp(self): def test_execute_read(self): """Test access setting for read""" - self._add_task( + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -784,22 +784,22 @@ def test_execute_read(self): 'irods_backend': self.irods_backend, }, ) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=DEFAULT_USER_GROUP + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=DEFAULT_USER_GROUP ) self.assertEqual(user_access, None) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=DEFAULT_USER_GROUP + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=DEFAULT_USER_GROUP ) self.assertIsInstance(user_access, iRODSAccess) self.assertEqual(user_access.access_name, self.irods_access_read) def test_execute_write(self): """Test access setting for write/modify""" - self._add_task( + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -810,23 +810,23 @@ def test_execute_write(self): 'irods_backend': self.irods_backend, }, ) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=DEFAULT_USER_GROUP + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=DEFAULT_USER_GROUP ) self.assertEqual(user_access, None) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=DEFAULT_USER_GROUP + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=DEFAULT_USER_GROUP ) self.assertIsInstance(user_access, iRODSAccess) self.assertEqual(user_access.access_name, self.irods_access_write) def test_execute_twice(self): """Test access setting twice""" - self._add_task( + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -837,11 +837,11 @@ def test_execute_twice(self): 'irods_backend': self.irods_backend, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -852,18 +852,18 @@ def test_execute_twice(self): 'irods_backend': self.irods_backend, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=DEFAULT_USER_GROUP + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=DEFAULT_USER_GROUP ) self.assertIsInstance(user_access, iRODSAccess) self.assertEqual(user_access.access_name, self.irods_access_read) def test_revert_created(self): """Test reverting created access""" - self._add_task( + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -875,18 +875,18 @@ def test_revert_created(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=DEFAULT_USER_GROUP + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=DEFAULT_USER_GROUP ) self.assertIsNone(user_access) # self.assertEqual(user_access.access_name, TEST_ACCESS_NULL) def test_revert_modified(self): """Test reverting modified access""" - self._add_task( + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -897,10 +897,10 @@ def test_revert_modified(self): 'irods_backend': self.irods_backend, }, ) - self._run_flow() + self.run_flow() - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -912,18 +912,18 @@ def test_revert_modified(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=DEFAULT_USER_GROUP + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=DEFAULT_USER_GROUP ) self.assertIsInstance(user_access, iRODSAccess) self.assertEqual(user_access.access_name, self.irods_access_read) def test_revert_not_modified(self): """Test access setting reverting without modification""" - self._add_task( + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -934,11 +934,11 @@ def test_revert_not_modified(self): 'irods_backend': self.irods_backend, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -950,11 +950,11 @@ def test_revert_not_modified(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=DEFAULT_USER_GROUP + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=DEFAULT_USER_GROUP ) self.assertIsInstance(user_access, iRODSAccess) self.assertEqual(user_access.access_name, self.irods_access_read) @@ -968,7 +968,7 @@ def test_execute_no_recursion(self): user_type=TEST_USER_TYPE, user_zone=self.irods.zone, ) - self._add_task( + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -981,27 +981,23 @@ def test_execute_no_recursion(self): }, ) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=TEST_USER + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=TEST_USER ) self.assertEqual(user_access, None) - user_access = self._get_user_access( - target=sub_coll, user_name=TEST_USER - ) + user_access = self.get_user_access(target=sub_coll, user_name=TEST_USER) self.assertEqual(user_access, None) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=TEST_USER + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=TEST_USER ) self.assertIsInstance(user_access, iRODSAccess) self.assertEqual(user_access.access_name, self.irods_access_read) - user_access = self._get_user_access( - target=sub_coll, user_name=TEST_USER - ) + user_access = self.get_user_access(target=sub_coll, user_name=TEST_USER) self.assertEqual(user_access, None) def test_revert_no_recursion(self): @@ -1013,7 +1009,7 @@ def test_revert_no_recursion(self): user_zone=self.irods.zone, ) - self._add_task( + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -1027,27 +1023,23 @@ def test_revert_no_recursion(self): force_fail=True, ) # FAIL - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=TEST_USER + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=TEST_USER ) self.assertEqual(user_access, None) - user_access = self._get_user_access( - target=sub_coll, user_name=TEST_USER - ) + user_access = self.get_user_access(target=sub_coll, user_name=TEST_USER) self.assertEqual(user_access, None) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, False) - user_access = self._get_user_access( - target=self._get_test_coll(), user_name=TEST_USER + user_access = self.get_user_access( + target=self.get_test_coll(), user_name=TEST_USER ) self.assertEqual(user_access, None) - user_access = self._get_user_access( - target=sub_coll, user_name=TEST_USER - ) + user_access = self.get_user_access(target=sub_coll, user_name=TEST_USER) self.assertEqual(user_access, None) @@ -1060,7 +1052,7 @@ def setUp(self): def test_execute(self): """Test issuing a ticket""" self.assertIsNone(self.irods_backend.get_ticket(self.irods, TICKET_STR)) - self._add_task( + self.add_task( cls=IssueTicketTask, name='Issue ticket', inject={ @@ -1070,7 +1062,7 @@ def test_execute(self): 'irods_backend': self.irods_backend, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertIsInstance( self.irods_backend.get_ticket(self.irods, TICKET_STR), Ticket @@ -1078,7 +1070,7 @@ def test_execute(self): def test_execute_twice(self): """Test issuing a ticket_twice""" - self._add_task( + self.add_task( cls=IssueTicketTask, name='Issue ticket', inject={ @@ -1088,14 +1080,14 @@ def test_execute_twice(self): 'irods_backend': self.irods_backend, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertIsInstance( self.irods_backend.get_ticket(self.irods, TICKET_STR), Ticket ) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=IssueTicketTask, name='Issue ticket', inject={ @@ -1105,7 +1097,7 @@ def test_execute_twice(self): 'irods_backend': self.irods_backend, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertIsInstance( self.irods_backend.get_ticket(self.irods, TICKET_STR), Ticket @@ -1114,7 +1106,7 @@ def test_execute_twice(self): def test_revert_modified(self): """Test reverting a ticket issuing""" self.assertIsNone(self.irods_backend.get_ticket(self.irods, TICKET_STR)) - self._add_task( + self.add_task( cls=IssueTicketTask, name='Issue ticket', inject={ @@ -1125,7 +1117,7 @@ def test_revert_modified(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, False) self.assertIsNone(self.irods_backend.get_ticket(self.irods, TICKET_STR)) @@ -1137,7 +1129,7 @@ def test_revert_not_modified(self): self.assertIsInstance( self.irods_backend.get_ticket(self.irods, TICKET_STR), Ticket ) - self._add_task( + self.add_task( cls=IssueTicketTask, name='Issue ticket', inject={ @@ -1148,7 +1140,7 @@ def test_revert_not_modified(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, False) self.assertIsInstance( self.irods_backend.get_ticket(self.irods, TICKET_STR), Ticket @@ -1166,7 +1158,7 @@ def test_execute(self): self.assertIsInstance( self.irods_backend.get_ticket(self.irods, TICKET_STR), Ticket ) - self._add_task( + self.add_task( cls=DeleteTicketTask, name='Delete ticket', inject={ @@ -1176,7 +1168,7 @@ def test_execute(self): 'irods_backend': self.irods_backend, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertIsNone(self.irods_backend.get_ticket(self.irods, TICKET_STR)) @@ -1188,7 +1180,7 @@ def test_execute_twice(self): self.assertIsInstance( self.irods_backend.get_ticket(self.irods, TICKET_STR), Ticket ) - self._add_task( + self.add_task( cls=DeleteTicketTask, name='Delete ticket', inject={ @@ -1198,12 +1190,12 @@ def test_execute_twice(self): 'irods_backend': self.irods_backend, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertIsNone(self.irods_backend.get_ticket(self.irods, TICKET_STR)) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=DeleteTicketTask, name='Delete ticket', inject={ @@ -1213,7 +1205,7 @@ def test_execute_twice(self): 'irods_backend': self.irods_backend, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertIsNone(self.irods_backend.get_ticket(self.irods, TICKET_STR)) @@ -1225,7 +1217,7 @@ def test_revert_modified(self): self.assertIsInstance( self.irods_backend.get_ticket(self.irods, TICKET_STR), Ticket ) - self._add_task( + self.add_task( cls=DeleteTicketTask, name='Delete ticket', inject={ @@ -1236,7 +1228,7 @@ def test_revert_modified(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, False) self.assertIsInstance( self.irods_backend.get_ticket(self.irods, TICKET_STR), Ticket @@ -1245,7 +1237,7 @@ def test_revert_modified(self): def test_revert_not_modified(self): """Test reverting ticket deletion with no modification""" self.assertIsNone(self.irods_backend.get_ticket(self.irods, TICKET_STR)) - self._add_task( + self.add_task( cls=DeleteTicketTask, name='Delete ticket', inject={ @@ -1256,7 +1248,7 @@ def test_revert_not_modified(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, False) self.assertIsNone(self.irods_backend.get_ticket(self.irods, TICKET_STR)) @@ -1266,13 +1258,13 @@ class TestCreateUserTask(IRODSTaskTestBase): def test_execute(self): """Test user creation""" - self._add_task( + self.add_task( cls=CreateUserTask, name='Create user', inject={'user_name': TEST_USER, 'user_type': TEST_USER_TYPE}, ) self.assertRaises(UserDoesNotExist, self.irods.users.get, TEST_USER) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) user = self.irods.users.get(TEST_USER) @@ -1280,57 +1272,57 @@ def test_execute(self): def test_execute_twice(self): """Test user creation twice""" - self._add_task( + self.add_task( cls=CreateUserTask, name='Create user', inject={'user_name': TEST_USER, 'user_type': TEST_USER_TYPE}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=CreateUserTask, name='Create user', inject={'user_name': TEST_USER, 'user_type': TEST_USER_TYPE}, ) - self._run_flow() + self.run_flow() user = self.irods.users.get(TEST_USER) self.assertIsInstance(user, iRODSUser) def test_revert_created(self): """Test user creation reverting after creating""" - self._add_task( + self.add_task( cls=CreateUserTask, name='Create user', inject={'user_name': TEST_USER, 'user_type': TEST_USER_TYPE}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) self.assertRaises(UserDoesNotExist, self.irods.users.get, TEST_USER) def test_revert_not_modified(self): """Test user creation reverting without modification""" - self._add_task( + self.add_task( cls=CreateUserTask, name='Create user', inject={'user_name': TEST_USER, 'user_type': TEST_USER_TYPE}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) # Init and run new flow - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=CreateUserTask, name='Create user', inject={'user_name': TEST_USER, 'user_type': TEST_USER_TYPE}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) user = self.irods.users.get(TEST_USER) @@ -1357,7 +1349,7 @@ def setUp(self): def test_execute(self): """Test user addition""" - self._add_task( + self.add_task( cls=AddUserToGroupTask, name='Add user to group', inject={ @@ -1367,7 +1359,7 @@ def test_execute(self): ) group = self.irods.user_groups.get(DEFAULT_USER_GROUP) self.assertEqual(group.hasmember(GROUPLESS_USER), False) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) group = self.irods.user_groups.get(DEFAULT_USER_GROUP) @@ -1375,7 +1367,7 @@ def test_execute(self): def test_execute_twice(self): """Test user addition twice""" - self._add_task( + self.add_task( cls=AddUserToGroupTask, name='Add user to group', inject={ @@ -1383,11 +1375,11 @@ def test_execute_twice(self): 'user_name': GROUPLESS_USER, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=AddUserToGroupTask, name='Add user to group', inject={ @@ -1395,7 +1387,7 @@ def test_execute_twice(self): 'user_name': GROUPLESS_USER, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) group = self.irods.user_groups.get(DEFAULT_USER_GROUP) @@ -1403,7 +1395,7 @@ def test_execute_twice(self): def test_revert_modified(self): """Test user addition reverting after modification""" - self._add_task( + self.add_task( cls=AddUserToGroupTask, name='Add user to group', inject={ @@ -1412,7 +1404,7 @@ def test_revert_modified(self): }, force_fail=True, ) # FAILS - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) group = self.irods.user_groups.get(DEFAULT_USER_GROUP) @@ -1420,7 +1412,7 @@ def test_revert_modified(self): def test_revert_not_modified(self): """Test user addition reverting without modification""" - self._add_task( + self.add_task( cls=AddUserToGroupTask, name='Add user to group', inject={ @@ -1428,10 +1420,10 @@ def test_revert_not_modified(self): 'user_name': GROUPLESS_USER, }, ) - self._run_flow() + self.run_flow() - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=AddUserToGroupTask, name='Add user to group', inject={ @@ -1440,7 +1432,7 @@ def test_revert_not_modified(self): }, force_fail=True, ) # FAILS - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) group = self.irods.user_groups.get(DEFAULT_USER_GROUP) @@ -1462,14 +1454,14 @@ def setUp(self): def test_execute(self): """Test user removal""" - self._add_task( + self.add_task( cls=RemoveUserFromGroupTask, name='Remove user from group', inject={'group_name': DEFAULT_USER_GROUP, 'user_name': GROUP_USER}, ) group = self.irods.user_groups.get(DEFAULT_USER_GROUP) self.assertEqual(group.hasmember(GROUP_USER), True) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) group = self.irods.user_groups.get(DEFAULT_USER_GROUP) @@ -1477,21 +1469,21 @@ def test_execute(self): def test_execute_twice(self): """Test user removal twice""" - self._add_task( + self.add_task( cls=RemoveUserFromGroupTask, name='Remove user from group', inject={'group_name': DEFAULT_USER_GROUP, 'user_name': GROUP_USER}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=RemoveUserFromGroupTask, name='Remove user from group', inject={'group_name': DEFAULT_USER_GROUP, 'user_name': GROUP_USER}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) group = self.irods.user_groups.get(DEFAULT_USER_GROUP) @@ -1499,13 +1491,13 @@ def test_execute_twice(self): def test_revert_modified(self): """Test user ramoval reverting after modification""" - self._add_task( + self.add_task( cls=RemoveUserFromGroupTask, name='Remove user from group', inject={'group_name': DEFAULT_USER_GROUP, 'user_name': GROUP_USER}, force_fail=True, ) # FAILS - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) group = self.irods.user_groups.get(DEFAULT_USER_GROUP) @@ -1513,21 +1505,21 @@ def test_revert_modified(self): def test_revert_not_modified(self): """Test user removal reverting without modification""" - self._add_task( + self.add_task( cls=RemoveUserFromGroupTask, name='Remove user from group', inject={'group_name': DEFAULT_USER_GROUP, 'user_name': GROUP_USER}, ) - self._run_flow() + self.run_flow() - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=RemoveUserFromGroupTask, name='Remove user from group', inject={'group_name': DEFAULT_USER_GROUP, 'user_name': GROUP_USER}, force_fail=True, ) # FAILS - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) group = self.irods.user_groups.get(DEFAULT_USER_GROUP) @@ -1549,7 +1541,7 @@ def setUp(self): def test_execute(self): """Test moving a data object""" move_obj_path = os.path.join(self.move_coll_path, TEST_OBJ_NAME) - self._add_task( + self.add_task( cls=MoveDataObjectTask, name='Move data object', inject={ @@ -1559,7 +1551,7 @@ def test_execute(self): ) with self.assertRaises(DataObjectDoesNotExist): self.irods.data_objects.get(move_obj_path) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertEqual(self.irods.data_objects.exists(self.obj_path), False) self.assertEqual(self.irods.data_objects.exists(move_obj_path), True) @@ -1567,7 +1559,7 @@ def test_execute(self): def test_revert(self): """Test reverting the moving of a data object""" move_obj_path = os.path.join(self.move_coll_path, TEST_OBJ_NAME) - self._add_task( + self.add_task( cls=MoveDataObjectTask, name='Move data object', inject={ @@ -1576,7 +1568,7 @@ def test_revert(self): }, force_fail=True, ) # FAILS - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, False) self.assertEqual(self.irods.data_objects.exists(self.obj_path), True) self.assertEqual(self.irods.data_objects.exists(move_obj_path), False) @@ -1586,7 +1578,7 @@ def test_overwrite_failure(self): new_obj_path = os.path.join(self.move_coll_path, TEST_OBJ_NAME) # Create object already in target new_obj = self.irods.data_objects.create(new_obj_path) - self._add_task( + self.add_task( cls=MoveDataObjectTask, name='Move data object', inject={ @@ -1595,7 +1587,7 @@ def test_overwrite_failure(self): }, ) with self.assertRaises(Exception): - self._run_flow() + self.run_flow() # Assert state of both objects after attempted move # TODO: Better way to compare file objects than checksum? @@ -1625,7 +1617,7 @@ def setUp(self): def test_execute_read(self): """Test access setting for read""" - self._add_task( + self.add_task( cls=BatchSetAccessTask, name='Set access', inject={ @@ -1638,7 +1630,7 @@ def test_execute_read(self): ) self.assert_irods_access(DEFAULT_USER_GROUP, self.sub_coll_path, None) self.assert_irods_access(DEFAULT_USER_GROUP, self.sub_coll_path2, None) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assert_irods_access( @@ -1650,7 +1642,7 @@ def test_execute_read(self): def test_execute_write(self): """Test access setting for write/modify""" - self._add_task( + self.add_task( cls=BatchSetAccessTask, name='Set access', inject={ @@ -1663,7 +1655,7 @@ def test_execute_write(self): ) self.assert_irods_access(DEFAULT_USER_GROUP, self.sub_coll_path, None) self.assert_irods_access(DEFAULT_USER_GROUP, self.sub_coll_path2, None) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assert_irods_access( @@ -1675,7 +1667,7 @@ def test_execute_write(self): def test_execute_mixed(self): """Test access setting for both new and previously set access levels""" - self._add_task( + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -1686,14 +1678,14 @@ def test_execute_mixed(self): 'irods_backend': self.irods_backend, }, ) - self._run_flow() + self.run_flow() self.assert_irods_access( DEFAULT_USER_GROUP, self.sub_coll_path, self.irods_access_read ) self.assert_irods_access(DEFAULT_USER_GROUP, self.sub_coll_path2, None) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=BatchSetAccessTask, name='Set access', inject={ @@ -1704,7 +1696,7 @@ def test_execute_mixed(self): 'irods_backend': self.irods_backend, }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assert_irods_access( @@ -1716,7 +1708,7 @@ def test_execute_mixed(self): def test_revert_created(self): """Test reverting created access""" - self._add_task( + self.add_task( cls=BatchSetAccessTask, name='Set access', inject={ @@ -1730,7 +1722,7 @@ def test_revert_created(self): ) # FAIL self.assert_irods_access(DEFAULT_USER_GROUP, self.sub_coll_path, None) self.assert_irods_access(DEFAULT_USER_GROUP, self.sub_coll_path2, None) - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) self.assert_irods_access(DEFAULT_USER_GROUP, self.sub_coll_path, None) @@ -1738,7 +1730,7 @@ def test_revert_created(self): def test_revert_modified(self): """Test reverting modified access""" - self._add_task( + self.add_task( cls=BatchSetAccessTask, name='Set access', inject={ @@ -1749,7 +1741,7 @@ def test_revert_modified(self): 'irods_backend': self.irods_backend, }, ) - self._run_flow() + self.run_flow() self.assert_irods_access( DEFAULT_USER_GROUP, self.sub_coll_path, self.irods_access_read ) @@ -1757,8 +1749,8 @@ def test_revert_modified(self): DEFAULT_USER_GROUP, self.sub_coll_path2, self.irods_access_read ) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=BatchSetAccessTask, name='Set access', inject={ @@ -1770,7 +1762,7 @@ def test_revert_modified(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) self.assert_irods_access( @@ -1782,7 +1774,7 @@ def test_revert_modified(self): def test_revert_mixed(self): """Test reverting access for both new and existing access levels""" - self._add_task( + self.add_task( cls=SetAccessTask, name='Set access', inject={ @@ -1793,14 +1785,14 @@ def test_revert_mixed(self): 'irods_backend': self.irods_backend, }, ) - self._run_flow() + self.run_flow() self.assert_irods_access( DEFAULT_USER_GROUP, self.sub_coll_path, self.irods_access_read ) self.assert_irods_access(DEFAULT_USER_GROUP, self.sub_coll_path2, None) - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=BatchSetAccessTask, name='Set access', inject={ @@ -1812,7 +1804,7 @@ def test_revert_mixed(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) self.assert_irods_access( @@ -1830,7 +1822,7 @@ def setUp(self): def test_execute(self): """Test batch collection creation""" - self._add_task( + self.add_task( cls=BatchCreateCollectionsTask, name='Create collections', inject={'paths': [self.new_coll_path, self.new_coll_path2]}, @@ -1845,7 +1837,7 @@ def test_execute(self): self.irods.collections.get, self.new_coll_path2, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertIsInstance( @@ -1859,20 +1851,20 @@ def test_execute(self): def test_execute_twice(self): """Test batch collection creation twice""" - self._add_task( + self.add_task( cls=BatchCreateCollectionsTask, name='Create collections', inject={'paths': [self.new_coll_path, self.new_coll_path2]}, ) - self._run_flow() + self.run_flow() - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=BatchCreateCollectionsTask, name='Create collections', inject={'paths': [self.new_coll_path, self.new_coll_path2]}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertIsInstance( @@ -1886,13 +1878,13 @@ def test_execute_twice(self): def test_revert_created(self): """Test batch collection creation reverting after creating""" - self._add_task( + self.add_task( cls=BatchCreateCollectionsTask, name='Create collections', inject={'paths': [self.new_coll_path, self.new_coll_path2]}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) self.assertRaises( @@ -1908,23 +1900,23 @@ def test_revert_created(self): def test_revert_not_modified(self): """Test batch collection creation reverting without modification""" - self._add_task( + self.add_task( cls=BatchCreateCollectionsTask, name='Create collections', inject={'paths': [self.new_coll_path, self.new_coll_path2]}, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) # Init and run new flow - self.flow = self._init_flow() - self._add_task( + self.flow = self.init_flow() + self.add_task( cls=BatchCreateCollectionsTask, name='Create collections', inject={'paths': [self.new_coll_path, self.new_coll_path2]}, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) self.assertIsInstance( @@ -1938,7 +1930,7 @@ def test_revert_not_modified(self): def test_execute_nested(self): """Test batch collection creation with nested collections""" - self._add_task( + self.add_task( cls=BatchCreateCollectionsTask, name='Create collections', inject={ @@ -1948,7 +1940,7 @@ def test_execute_nested(self): ] }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertTrue( @@ -1964,7 +1956,7 @@ def test_execute_nested(self): def test_execute_nested_existing(self): """Test batch collection creation with existing collection""" - self._add_task( + self.add_task( cls=BatchCreateCollectionsTask, name='Create collections', inject={ @@ -1974,7 +1966,7 @@ def test_execute_nested_existing(self): ] }, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertTrue( @@ -1990,7 +1982,7 @@ def test_execute_nested_existing(self): def test_revert_created_nested(self): """Test batch creation reverting with nested collections""" - self._add_task( + self.add_task( cls=BatchCreateCollectionsTask, name='Create collections', inject={ @@ -2001,7 +1993,7 @@ def test_revert_created_nested(self): }, force_fail=True, ) # FAIL - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) self.assertRaises( @@ -2055,7 +2047,7 @@ def setUp(self): def test_execute(self): """Test moving data objects and setting access""" - self._add_task( + self.add_task( cls=BatchMoveDataObjectsTask, name='Move data objects', inject={ @@ -2071,28 +2063,28 @@ def test_execute(self): self.assertFalse(self.irods.data_objects.exists(self.dest_obj_path)) self.assertFalse(self.irods.data_objects.exists(self.dest_obj2_path)) self.assertEqual( - self._get_user_access( + self.get_user_access( target=self.irods.data_objects.get(self.batch_obj_path), user_name=DEFAULT_USER_GROUP, ), None, ) self.assertEqual( - self._get_user_access( + self.get_user_access( target=self.irods.data_objects.get(self.batch_obj2_path), user_name=DEFAULT_USER_GROUP, ), None, ) - result = self._run_flow() + result = self.run_flow() self.assertEqual(result, True) self.assertFalse(self.irods.data_objects.exists(self.batch_obj_path)) self.assertFalse(self.irods.data_objects.exists(self.batch_obj2_path)) self.assertTrue(self.irods.data_objects.exists(self.dest_obj_path)) self.assertTrue(self.irods.data_objects.exists(self.dest_obj2_path)) - obj_access = self._get_user_access( + obj_access = self.get_user_access( target=self.irods.data_objects.get( '{}/batch_obj'.format(self.batch_dest_path) ), @@ -2100,7 +2092,7 @@ def test_execute(self): ) self.assertIsInstance(obj_access, iRODSAccess) self.assertEqual(obj_access.access_name, self.irods_access_read) - obj_access = self._get_user_access( + obj_access = self.get_user_access( target=self.irods.data_objects.get(self.dest_obj_path), user_name=DEFAULT_USER_GROUP, ) @@ -2109,7 +2101,7 @@ def test_execute(self): def test_revert(self): """Test reverting the moving of data objects""" - self._add_task( + self.add_task( cls=BatchMoveDataObjectsTask, name='Move data objects', inject={ @@ -2123,19 +2115,19 @@ def test_revert(self): }, force_fail=True, ) # FAILS - result = self._run_flow() + result = self.run_flow() self.assertNotEqual(result, True) self.assertTrue(self.irods.data_objects.exists(self.batch_obj_path)) self.assertTrue(self.irods.data_objects.exists(self.batch_obj2_path)) self.assertFalse(self.irods.data_objects.exists(self.dest_obj_path)) self.assertFalse(self.irods.data_objects.exists(self.dest_obj2_path)) - obj_access = self._get_user_access( + obj_access = self.get_user_access( target=self.irods.data_objects.get(self.batch_obj_path), user_name=DEFAULT_USER_GROUP, ) self.assertIsNone(obj_access) - obj_access = self._get_user_access( + obj_access = self.get_user_access( target=self.irods.data_objects.get(self.batch_obj2_path), user_name=DEFAULT_USER_GROUP, ) @@ -2146,7 +2138,7 @@ def test_overwrite_failure(self): new_obj_path = os.path.join(self.batch_dest_path, 'batch_obj2') # Create object already in target new_obj = self.irods.data_objects.create(new_obj_path) - self._add_task( + self.add_task( cls=BatchMoveDataObjectsTask, name='Move data objects', inject={ @@ -2160,7 +2152,7 @@ def test_overwrite_failure(self): }, ) with self.assertRaises(Exception): - self._run_flow() + self.run_flow() # Assert state of objects after attempted move self.assertTrue(self.irods.data_objects.exists(self.batch_obj_path)) @@ -2187,12 +2179,12 @@ def test_calculate(self): ) self.assertIsNone(obj.replicas[0].checksum) - self._add_task( + self.add_task( cls=BatchCalculateChecksumTask, name='Calculate checksums', inject={'file_paths': [self.obj_path], 'force': False}, ) - self._run_flow() + self.run_flow() # Object must be reloaded to refresh replica info obj = self.irods.data_objects.get(self.obj_path) @@ -2205,12 +2197,12 @@ def test_calculate_twice(self): self.assertIsNotNone(obj.replicas[0].checksum) self.assertEqual(obj.replicas[0].checksum, self.get_md5_checksum(obj)) - self._add_task( + self.add_task( cls=BatchCalculateChecksumTask, name='Calculate checksums', inject={'file_paths': [self.obj_path], 'force': False}, ) - self._run_flow() + self.run_flow() obj = self.irods.data_objects.get(self.obj_path) self.assertIsNotNone(obj.replicas[0].checksum)