Fix test issues

awx/main/analytics/collectors.py

@@ -2,6 +2,7 @@
 import os
 import os.path
 import platform
+import distro
 
 from django.db import connection
 from django.db.models import Count
@@ -43,7 +44,7 @@ def config(since, **kwargs):
     return {
         'platform': {
             'system': platform.system(),
-            'dist': platform.dist(),
+            'dist': distro.linux_distribution(),
             'release': platform.release(),
             'type': install_type,
         },

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

@@ -3,13 +3,12 @@
 from unittest.mock import Mock
 
 from awx.main.models import (
-    Job,
     InstanceGroup,
 )
 
 
 def T(impact):
-    j = mock.Mock(Job())
+    j = mock.Mock(spec_set=['task_impact'])
     j.task_impact = impact
     return j
 

awx/main/tests/unit/scheduler/test_kubernetes.py

@@ -1,5 +1,4 @@
 import pytest
-from unittest import mock
 from django.conf import settings
 
 from awx.main.models import (
@@ -14,7 +13,7 @@
 
 @pytest.fixture
 def container_group():
-    instance_group = mock.Mock(InstanceGroup(name='container-group'))
+    instance_group = InstanceGroup(name='container-group', id=1)
 
     return instance_group
 

requirements/requirements.in

@@ -8,6 +8,7 @@ channels
 channels-redis>=3.1.0  # https://github.com/django/channels_redis/issues/212
 cryptography<3.0.0
 daphne
+distro
 django==2.2.16  # see UPGRADE BLOCKERs
 django-auth-ldap
 django-cors-headers

requirements/requirements.txt

@@ -83,6 +83,8 @@ defusedxml==0.6.0
     #   social-auth-core
 dictdiffer==0.8.1
     # via openshift
+distro==1.5.0
+    # via -r /awx_devel/requirements/requirements.in
 django-auth-ldap==2.1.0
     # via -r /awx_devel/requirements/requirements.in
 django-cors-headers==3.2.1