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

Get unit tests to pass with created_by changes.

Browse Source
This commit is contained in:
Chris Church
2014-04-01 22:42:16 -04:00
parent c453c26124
commit 3aa517154e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/base.py
View File

@@ -292,7 +292,7 @@ class PrimordialModel(CreatedModifiedModel):
user = get_current_user() user = get_current_user()
if user and not user.pk: if user and not user.pk:
user = None user = None
if not self.pk: if not self.pk and not self.created_by:
self.created_by = user self.created_by = user
if 'created_by' not in update_fields: if 'created_by' not in update_fields:
update_fields.append('created_by') update_fields.append('created_by')

4
awx/main/tests/projects.py
View File

@@ -478,14 +478,14 @@ class ProjectsTest(BaseTest):
# can add credentials to a user (if user or org admin or super user) # can add credentials to a user (if user or org admin or super user)
self.post(other_creds, data=new_credentials, expect=401) self.post(other_creds, data=new_credentials, expect=401)
self.post(other_creds, data=new_credentials, expect=401, auth=self.get_invalid_credentials()) self.post(other_creds, data=new_credentials, expect=401, auth=self.get_invalid_credentials())
self.post(other_creds, data=new_credentials, expect=201, auth=self.get_super_credentials()) result = self.post(other_creds, data=new_credentials, expect=201, auth=self.get_super_credentials())
cred_user = result['id']
new_credentials['name'] = 'credential2' new_credentials['name'] = 'credential2'
self.post(other_creds, data=new_credentials, expect=201, auth=self.get_normal_credentials()) self.post(other_creds, data=new_credentials, expect=201, auth=self.get_normal_credentials())
new_credentials['name'] = 'credential3' new_credentials['name'] = 'credential3'
result = self.post(other_creds, data=new_credentials, expect=201, auth=self.get_other_credentials()) result = self.post(other_creds, data=new_credentials, expect=201, auth=self.get_other_credentials())
new_credentials['name'] = 'credential4' new_credentials['name'] = 'credential4'
self.post(other_creds, data=new_credentials, expect=403, auth=self.get_nobody_credentials()) self.post(other_creds, data=new_credentials, expect=403, auth=self.get_nobody_credentials())
cred_user = result['id']
# can add credentials to a team # can add credentials to a team
new_credentials['name'] = 'credential' new_credentials['name'] = 'credential'