External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rbac' of github.com:anoek/ansible-tower into rbac

Browse Source
This commit is contained in:
Akita Noek
2016-03-23 15:30:33 -04:00
parent 4aa1602255 8afa10466f
commit de114336ef
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tests/base.py
View File

@@ -383,7 +383,11 @@ class BaseTestMixin(QueueTestMixin, MockCommonlySlowTestMixin):
'vault_password': '', 'vault_password': '',
} }
opts.update(kwargs) opts.update(kwargs)
return Credential.objects.create(**opts) user = opts['user']
del opts['user']
cred = Credential.objects.create(**opts)
cred.owner_role.members.add(user)
return cred
def setup_instances(self): def setup_instances(self):
instance = Instance(uuid=settings.SYSTEM_UUID, primary=True, hostname='127.0.0.1') instance = Instance(uuid=settings.SYSTEM_UUID, primary=True, hostname='127.0.0.1')

6
awx/main/tests/job_base.py
View File

@@ -142,12 +142,12 @@ class BaseJobTestMixin(BaseTestMixin):
self.org_eng.projects.add(self.proj_dev) self.org_eng.projects.add(self.proj_dev)
self.proj_test = self.make_project('test', 'testing branch', self.proj_test = self.make_project('test', 'testing branch',
self.user_sue, TEST_PLAYBOOK) 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.org_sup.projects.add(self.proj_test)
self.proj_prod = self.make_project('prod', 'production branch', self.proj_prod = self.make_project('prod', 'production branch',
self.user_sue, TEST_PLAYBOOK) self.user_sue, TEST_PLAYBOOK)
self.org_eng.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) #self.org_sup.projects.add(self.proj_prod) # No more multi org projects
self.org_ops.projects.add(self.proj_prod) self.org_ops.projects.add(self.proj_prod)
# Operations also has 2 additional projects specific to the east/west # Operations also has 2 additional projects specific to the east/west

3
awx/main/tests/old/jobs/jobs_monolithic.py
View File

@@ -197,6 +197,7 @@ class JobTemplateTest(BaseJobTestMixin, django.test.TransactionTestCase):
'last_job_failed', 'survey_enabled') 'last_job_failed', 'survey_enabled')
def test_get_job_template_list(self): 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') url = reverse('api:job_template_list')
qs = JobTemplate.objects.distinct() qs = JobTemplate.objects.distinct()
fields = self.JOB_TEMPLATE_FIELDS 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']]) self.assertFalse('north' in [x['username'] for x in all_credentials['results']])
def test_post_job_template_list(self): 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') url = reverse('api:job_template_list')
data = dict( data = dict(
name = 'new job template', name = 'new job template',
@@ -460,6 +462,7 @@ class JobTemplateTest(BaseJobTestMixin, django.test.TransactionTestCase):
# FIXME: Check other credentials and optional fields. # FIXME: Check other credentials and optional fields.
def test_post_scan_job_template(self): 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') url = reverse('api:job_template_list')
data = dict( data = dict(
name = 'scan job template 1', name = 'scan job template 1',