fix(tests): Correct Permission Import due to removing from access.models

ref: #605 #601

app/itam/tests/functional/device/test_device_viewset.py

@@ -1,11 +1,11 @@
 import pytest
 
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases
 from api.tests.abstract.api_permissions_viewset import APIPermissions

app/itam/tests/functional/device_model/test_device_model_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/itam/tests/functional/device_operating_system/test_device_operating_system_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/itam/tests/functional/device_software/test_device_software_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/itam/tests/functional/device_type/test_device_type_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/itam/tests/functional/endpoint_operating_system_installs/test_operating_system_installs_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissionView
 from api.tests.abstract.api_serializer_viewset import SerializerView

app/itam/tests/functional/endpoint_software_installs/test_software_installs_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/itam/tests/functional/inventory/test_inventory_viewset.py

@@ -3,12 +3,12 @@ import pytest
 
 from unittest.mock import patch
 
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases
 from api.tests.abstract.api_permissions_viewset import (

app/itam/tests/functional/operating_system/test_operating_system_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/itam/tests/functional/operating_system_version/test_operating_system_version_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/itam/tests/functional/software/test_software_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/itam/tests/functional/software_category/test_software_category_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/itam/tests/functional/software_version/test_software_version_viewset.py

@@ -1,10 +1,10 @@
 import pytest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/itam/tests/unit/device/test_device_api.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions import APIPermissions
 

app/itam/tests/unit/device/test_device_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/device/test_device_permission.py

@@ -1,6 +1,6 @@
 # from django.conf import settings
 # from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase
@@ -9,7 +9,7 @@ import pytest
 import unittest
 import requests
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from app.tests.abstract.model_permissions import ModelPermissions
 

app/itam/tests/unit/device/test_device_permission_api.py

@@ -1,11 +1,11 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions import APIPermissions
 

app/itam/tests/unit/device_model/test_device_model_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/device_model/test_device_model_permission.py

@@ -1,6 +1,6 @@
 # from django.conf import settings
 # from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -9,7 +9,7 @@ import pytest
 import unittest
 import requests
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from app.tests.abstract.model_permissions import ModelPermissions
 

app/itam/tests/unit/device_operating_system/test_device_operating_system_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/device_software/test_device_software_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/device_type/test_device_type_api_v2.py

@@ -1,12 +1,12 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/device_type/test_device_type_permission.py

@@ -1,6 +1,6 @@
 # from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -9,7 +9,7 @@ import pytest
 import unittest
 import requests
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from app.tests.abstract.model_permissions import ModelPermissions
 

app/itam/tests/unit/endpoint_operating_system_installs/test_operating_system_installs_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/endpoint_software_installs/test_software_installs_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/inventory/test_api_inventory.py

@@ -3,7 +3,7 @@ import json
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -11,7 +11,7 @@ from django.test.utils import override_settings
 
 from unittest.mock import patch
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.views.mixin import OrganizationPermissionAPI
 from api.serializers.inventory import Inventory

app/itam/tests/unit/inventory/test_inventory_permission_api.py

@@ -4,7 +4,7 @@ import unittest
 import requests
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -12,7 +12,7 @@ from django.test.utils import override_settings
 
 from unittest.mock import patch
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from itam.models.device import Device
 

app/itam/tests/unit/operating_system/test_operating_system_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/operating_system/test_operating_system_permission.py

@@ -1,6 +1,6 @@
 # from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -9,7 +9,7 @@ import pytest
 import unittest
 import requests
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from app.tests.abstract.model_permissions import ModelPermissions
 

app/itam/tests/unit/operating_system_version/test_operating_system_version_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/software/test_software_api.py

@@ -2,14 +2,14 @@ import pytest
 import unittest
 import requests
 
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from core.models.manufacturer import Manufacturer
 

app/itam/tests/unit/software/test_software_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/software/test_software_permission.py

@@ -1,6 +1,6 @@
 # from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -9,7 +9,7 @@ import pytest
 import unittest
 import requests
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from app.tests.abstract.model_permissions import ModelPermissions
 

app/itam/tests/unit/software/test_software_permission_api.py

@@ -2,11 +2,11 @@ import pytest
 import unittest
 import requests
 
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_permissions import APIPermissions
 

app/itam/tests/unit/software_category/test_software_category_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/itam/tests/unit/software_category/test_software_category_permission.py

@@ -1,6 +1,6 @@
 # from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -9,7 +9,7 @@ import pytest
 import unittest
 import requests
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from app.tests.abstract.model_permissions import ModelPermissions
 

app/itam/tests/unit/software_version/test_software_version_api_v2.py

@@ -1,14 +1,14 @@
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers, Permission
+from access.models import Organization, Team, TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject