Fixed authentication issues in unit tests

The tests were logging in incorrectly, which came to light due to Pillar
commit 4b5a961e1422d8e976b2bf8bb9a4f91addf9bbec.

tests/test_tasks.py

@@ -5,17 +5,18 @@ from bson import ObjectId
 
 import pillarsdk
 import pillarsdk.exceptions as sdk_exceptions
-import pillar.tests
+from pillarsdk.utils import remove_private_keys
 import pillar.tests.common_test_data as ctd
 
 from abstract_attract_test import AbstractAttractTest
-from pillarsdk.utils import remove_private_keys
 
 
 class TaskWorkflowTest(AbstractAttractTest):
     def setUp(self, **kwargs):
         AbstractAttractTest.setUp(self, **kwargs)
 
+        import pillar.tests
+
         self.mngr = self.attract.task_manager
         self.proj_id, self.project = self.ensure_project_exists()
 
@@ -24,7 +25,7 @@ class TaskWorkflowTest(AbstractAttractTest):
     def create_task(self, task_type=None, parent=None):
         with self.app.test_request_context():
             # Log in as project admin user
-            pillar.auth.login_user(ctd.EXAMPLE_PROJECT_OWNER_ID)
+            self.login_as_admin()
 
             self.mock_blenderid_validate_happy()
             task = self.mngr.create_task(self.sdk_project, task_type=task_type, parent=parent)
@@ -32,6 +33,9 @@ class TaskWorkflowTest(AbstractAttractTest):
         self.assertIsInstance(task, pillarsdk.Node)
         return task
 
+    def login_as_admin(self):
+        self.login_api_as(ctd.EXAMPLE_PROJECT_OWNER_ID)
+
     @responses.activate
     def test_create_task(self):
         task = self.create_task(task_type='Just düüüh it')
@@ -55,7 +59,7 @@ class TaskWorkflowTest(AbstractAttractTest):
 
         with self.app.test_request_context():
             # Log in as project admin user
-            pillar.auth.login_user(ctd.EXAMPLE_PROJECT_OWNER_ID)
+            self.login_as_admin()
 
             self.mock_blenderid_validate_happy()
             self.assertRaises(sdk_exceptions.PreconditionFailed,
@@ -93,7 +97,7 @@ class TaskWorkflowTest(AbstractAttractTest):
 
         with self.app.test_request_context():
             # Log in as project admin user
-            pillar.auth.login_user(ctd.EXAMPLE_PROJECT_OWNER_ID)
+            self.login_as_admin()
 
             self.mock_blenderid_validate_happy()
             self.mngr.edit_task(task._id,
@@ -141,7 +145,7 @@ class TaskWorkflowTest(AbstractAttractTest):
 
         with self.app.test_request_context():
             # Log in as project admin user
-            pillar.auth.login_user(ctd.EXAMPLE_PROJECT_OWNER_ID)
+            self.login_as_admin()
 
             self.mock_blenderid_validate_happy()
             self.assertRaises(sdk_exceptions.PreconditionFailed,
@@ -162,6 +166,7 @@ class TaskWorkflowTest(AbstractAttractTest):
     @responses.activate
     def test_delete_task_nonadmin(self):
         from pillar.api.projects.utils import get_admin_group_id
+        import pillar.auth
         from attract.tasks import routes
 
         self.enter_app_context()
@@ -195,6 +200,7 @@ class TaskWorkflowTest(AbstractAttractTest):
     @responses.activate
     def test_delete_task_nonmember(self):
         from attract.tasks import routes
+        import pillar.auth
 
         self.enter_app_context()