Merge branch 'master' into fix-ha

awx/main/tests/activity_stream.py

@@ -19,6 +19,8 @@ class ActivityStreamTest(BaseTest):
     def setUp(self):
         super(ActivityStreamTest, self).setUp()
         self.setup_instances()
+        self.create_test_license_file()
+        # TODO: Test non-enterprise license
         self.setup_users()
         self.org_created = self.post(reverse('api:organization_list'), dict(name='test org', description='test descr'), expect=201, auth=self.get_super_credentials())
 

awx/main/tests/ad_hoc.py

@@ -911,6 +911,8 @@ class AdHocCommandApiTest(BaseAdHocCommandTest):
 
     @mock.patch('awx.main.tasks.BaseTask.run_pexpect', side_effect=run_pexpect_mock)
     def test_ad_hoc_command_activity_stream(self, ignore):
+        # TODO: Test non-enterprise license
+        self.create_test_license_file()
         with self.current_user('admin'):
             response = self.run_test_ad_hoc_command()
 

awx/main/tests/base.py

@@ -179,7 +179,8 @@ class BaseTestMixin(QueueTestMixin, MockCommonlySlowTestMixin):
             contact_name='AWX Admin',
             contact_email='awx@example.com',
             license_date=license_date,
-            instance_count=instance_count)
+            instance_count=instance_count,
+            license_type='enterprise')
         handle, license_path = tempfile.mkstemp(suffix='.json')
         os.close(handle)
         writer.write_file(license_path)

awx/main/tests/jobs/jobs_monolithic.py

@@ -1020,6 +1020,8 @@ class JobTransactionTest(BaseJobTestMixin, django.test.LiveServerTestCase):
 class JobTemplateSurveyTest(BaseJobTestMixin, django.test.TestCase):
     def setUp(self):
         super(JobTemplateSurveyTest, self).setUp()
+        # TODO: Test non-enterprise license
+        self.create_test_license_file()
 
     def tearDown(self):
         super(JobTemplateSurveyTest, self).tearDown()

awx/main/tests/organizations.py

@@ -13,6 +13,8 @@ class OrganizationsTest(BaseTest):
     def setUp(self):
         super(OrganizationsTest, self).setUp()
         self.setup_instances()
+        # TODO: Test non-enterprise license
+        self.create_test_license_file()
         self.setup_users()
  
         self.organizations = self.make_organizations(self.super_django_user, 10)