diff --git a/awx/main/tests/job_base.py b/awx/main/tests/job_base.py index f48380f60b..44d643d08e 100644 --- a/awx/main/tests/job_base.py +++ b/awx/main/tests/job_base.py @@ -142,12 +142,12 @@ class BaseJobTestMixin(BaseTestMixin): self.org_eng.projects.add(self.proj_dev) self.proj_test = self.make_project('test', 'testing branch', self.user_sue, TEST_PLAYBOOK) - self.org_eng.projects.add(self.proj_test) + #self.org_eng.projects.add(self.proj_test) # No more multi org projects self.org_sup.projects.add(self.proj_test) self.proj_prod = self.make_project('prod', 'production branch', self.user_sue, TEST_PLAYBOOK) - self.org_eng.projects.add(self.proj_prod) - self.org_sup.projects.add(self.proj_prod) + #self.org_eng.projects.add(self.proj_prod) # No more multi org projects + #self.org_sup.projects.add(self.proj_prod) # No more multi org projects self.org_ops.projects.add(self.proj_prod) # Operations also has 2 additional projects specific to the east/west diff --git a/awx/main/tests/old/jobs/jobs_monolithic.py b/awx/main/tests/old/jobs/jobs_monolithic.py index a42eb2dfaa..6b6d25681e 100644 --- a/awx/main/tests/old/jobs/jobs_monolithic.py +++ b/awx/main/tests/old/jobs/jobs_monolithic.py @@ -197,6 +197,7 @@ class JobTemplateTest(BaseJobTestMixin, django.test.TransactionTestCase): 'last_job_failed', 'survey_enabled') def test_get_job_template_list(self): + self.skipTest('This test makes assumptions about projects being multi-org and needs to be updated/rewritten') url = reverse('api:job_template_list') qs = JobTemplate.objects.distinct() fields = self.JOB_TEMPLATE_FIELDS @@ -287,6 +288,7 @@ class JobTemplateTest(BaseJobTestMixin, django.test.TransactionTestCase): self.assertFalse('north' in [x['username'] for x in all_credentials['results']]) def test_post_job_template_list(self): + self.skipTest('This test makes assumptions about projects being multi-org and needs to be updated/rewritten') url = reverse('api:job_template_list') data = dict( name = 'new job template', @@ -460,6 +462,7 @@ class JobTemplateTest(BaseJobTestMixin, django.test.TransactionTestCase): # FIXME: Check other credentials and optional fields. def test_post_scan_job_template(self): + self.skipTest('This test makes assumptions about projects being multi-org and needs to be updated/rewritten') url = reverse('api:job_template_list') data = dict( name = 'scan job template 1',