Merge pull request #4011 from AlanCoding/sys_aud_test_issue

Remove in-place operations on Models in unit tests

awx/main/models/label.py

@@ -37,7 +37,7 @@ class Label(CommonModelNameNotUnique):
         return \
             Label.objects.filter(
                 organization=None,
-                jobtemplate_labels__isnull=True
+                unifiedjobtemplate_labels__isnull=True
             )
 
     def is_detached(self):

awx/main/tests/unit/api/serializers/test_inventory_serializers.py

@@ -28,12 +28,12 @@ class TestCustomInventoryScriptSerializer(object):
                               (False, False, False, None)))
     def test_to_representation_orphan(self, superuser, sysaudit, admin_role, value):
         with mock.patch.object(CustomInventoryScriptSerializer, 'get_summary_fields', return_value={}):
-                User.add_to_class('is_system_auditor', sysaudit)
+            with mock.patch.object(User, 'is_system_auditor', return_value=sysaudit):
                 user = User(username="root", is_superuser=superuser)
                 roles = [user] if admin_role else []
 
                 with mock.patch('awx.main.models.CustomInventoryScript.admin_role', new_callable=PropertyMock, return_value=roles):
-                    cis = CustomInventoryScript(pk=1, script='#!/python')
+                    cis = CustomInventoryScript(pk=1, script=value)
                     serializer = CustomInventoryScriptSerializer()
 
                     factory = APIRequestFactory()

awx/main/tests/unit/models/test_label.py

@@ -1,21 +1,24 @@
 import pytest
+import mock
 
 from awx.main.models.label import Label
 from awx.main.models.unified_jobs import UnifiedJobTemplate, UnifiedJob
 
 
-def test_get_orphaned_labels(mocker):
+mock_query_set = mock.MagicMock()
-    mock_query_set = mocker.MagicMock()
-    Label.objects.filter = mocker.MagicMock(return_value=mock_query_set)
 
+mock_objects = mock.MagicMock(filter=mock.MagicMock(return_value=mock_query_set))
+
+@mock.patch('awx.main.models.label.Label.objects', mock_objects)
+class TestLabelFilterMocked:
+
+    def test_get_orphaned_labels(self, mocker):
         ret = Label.get_orphaned_labels()
 
         assert mock_query_set == ret
-    Label.objects.filter.assert_called_with(organization=None, jobtemplate_labels__isnull=True)
+        Label.objects.filter.assert_called_with(organization=None, unifiedjobtemplate_labels__isnull=True)
 
-def test_is_detached(mocker):
+    def test_is_detached(self, mocker):
-    mock_query_set = mocker.MagicMock()
-    Label.objects.filter = mocker.MagicMock(return_value=mock_query_set)
         mock_query_set.count.return_value = 1
 
         label = Label(id=37)
@@ -25,9 +28,7 @@ def test_is_detached(mocker):
         Label.objects.filter.assert_called_with(id=37, unifiedjob_labels__isnull=True, unifiedjobtemplate_labels__isnull=True)
         mock_query_set.count.assert_called_with()
 
-def test_is_detached_not(mocker):
+    def test_is_detached_not(self, mocker):
-    mock_query_set = mocker.MagicMock()
-    Label.objects.filter = mocker.MagicMock(return_value=mock_query_set)
         mock_query_set.count.return_value = 0
 
         label = Label(id=37)
@@ -42,7 +43,7 @@ def test_is_detached_not(mocker):
         (0, 1, True),
         (1, 1, False),
     ])
-def test_is_candidate_for_detach(mocker, jt_count, j_count, expected):
+    def test_is_candidate_for_detach(self, mocker, jt_count, j_count, expected):
         mock_job_qs = mocker.MagicMock()
         mock_job_qs.count = mocker.MagicMock(return_value=j_count)
         UnifiedJob.objects = mocker.MagicMock()