From 75036185999d78cd911d7e58b6ad420cbe09da69 Mon Sep 17 00:00:00 2001 From: jo Date: Tue, 28 Jun 2022 20:56:46 +0200 Subject: [PATCH] test(api): fix lint errors --- api/libretime_api/core/models/user.py | 9 +++--- .../management/commands/test_bulk_import.py | 28 +++++++++++-------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/api/libretime_api/core/models/user.py b/api/libretime_api/core/models/user.py index ab1399a3c..400cb5536 100644 --- a/api/libretime_api/core/models/user.py +++ b/api/libretime_api/core/models/user.py @@ -121,6 +121,7 @@ class User(AbstractBaseUser): def is_superuser(self): return self.role == Role.ADMIN + # pylint: disable=unused-argument def get_user_permissions(self, obj=None): """ Users do not have permissions directly, only through groups @@ -129,14 +130,14 @@ class User(AbstractBaseUser): def get_group_permissions(self, obj=None): permissions = GROUPS[self.role] - if obj: + if obj is not None: obj_name = obj.__class__.__name__.lower() permissions = [perm for perm in permissions if obj_name in perm] # get permissions objects - q = models.Q() + query = models.Q() for perm in permissions: - q = q | models.Q(codename=perm) - return list(Permission.objects.filter(q)) + query = query | models.Q(codename=perm) + return list(Permission.objects.filter(query)) def get_all_permissions(self, obj=None): return self.get_user_permissions(obj) + self.get_group_permissions(obj) diff --git a/api/libretime_api/storage/tests/management/commands/test_bulk_import.py b/api/libretime_api/storage/tests/management/commands/test_bulk_import.py index e752cf010..7a257c95e 100644 --- a/api/libretime_api/storage/tests/management/commands/test_bulk_import.py +++ b/api/libretime_api/storage/tests/management/commands/test_bulk_import.py @@ -36,11 +36,17 @@ def _track_type(): ) +class MockImporter(Importer): + _handle_file: MagicMock + _upload_file: MagicMock + _delete_file: MagicMock + + @pytest.fixture(name="importer") def _importer(requests_mock: Mocker): requests_mock.post(f"{FAKE_URL}/rest/media", status_code=200) - obj = Importer(FAKE_URL, "auth") + obj: MockImporter = Importer(FAKE_URL, "auth") # type: ignore obj._handle_file = MagicMock(wraps=obj._handle_file) obj._upload_file = MagicMock(wraps=obj._upload_file) obj._delete_file = MagicMock(wraps=obj._delete_file) @@ -48,10 +54,10 @@ def _importer(requests_mock: Mocker): yield obj +@pytest.mark.django_db def test_importer( - db, import_paths: Tuple[Path, Path], - importer: Importer, + importer: MockImporter, track_type, ): importer.import_dir(import_paths[0], track_type.code, [".mp3"]) @@ -61,10 +67,10 @@ def test_importer( importer._delete_file.assert_not_called() +@pytest.mark.django_db def test_importer_and_delete( - db, import_paths: Tuple[Path, Path], - importer: Importer, + importer: MockImporter, track_type, ): importer.delete_after_upload = True @@ -75,10 +81,10 @@ def test_importer_and_delete( importer._delete_file.assert_called_with(import_paths[1]) +@pytest.mark.django_db def test_importer_existing_file( - db, import_paths: Tuple[Path, Path], - importer: Importer, + importer: MockImporter, track_type, ): baker.make("storage.File", md5="46305a7cf42ee53976c88d337e47e940") @@ -90,10 +96,10 @@ def test_importer_existing_file( importer._delete_file.assert_not_called() +@pytest.mark.django_db def test_importer_existing_file_and_delete( - db, import_paths: Tuple[Path, Path], - importer: Importer, + importer: MockImporter, track_type, ): baker.make("storage.File", md5="46305a7cf42ee53976c88d337e47e940") @@ -106,10 +112,10 @@ def test_importer_existing_file_and_delete( importer._delete_file.assert_called_with(import_paths[1]) +@pytest.mark.django_db def test_importer_missing_track_type( - db, import_paths: Tuple[Path, Path], - importer: Importer, + importer: MockImporter, ): with pytest.raises( ValueError,