From ecf4d2872a4873b7b18444d9731fcf41bd775f6b Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Thu, 17 Mar 2016 08:55:32 -0400 Subject: [PATCH] Fixes for schedule tests --- awx/main/tests/old/schedules.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/awx/main/tests/old/schedules.py b/awx/main/tests/old/schedules.py index fa95892eb8..1abcdc5c26 100644 --- a/awx/main/tests/old/schedules.py +++ b/awx/main/tests/old/schedules.py @@ -54,12 +54,12 @@ class ScheduleTest(BaseTest): self.setup_instances() self.setup_users() self.organizations = self.make_organizations(self.super_django_user, 2) - self.organizations[0].deprecated_admins.add(self.normal_django_user) - self.organizations[0].deprecated_users.add(self.other_django_user) - self.organizations[0].deprecated_users.add(self.normal_django_user) + self.organizations[0].admin_role.members.add(self.normal_django_user) + self.organizations[0].member_role.members.add(self.other_django_user) + self.organizations[0].member_role.members.add(self.normal_django_user) self.diff_org_user = self.make_user('fred') - self.organizations[1].deprecated_users.add(self.diff_org_user) + self.organizations[1].member_role.members.add(self.diff_org_user) self.cloud_source = Credential.objects.create(kind='awx', user=self.super_django_user, username='Dummy', password='Dummy') @@ -71,11 +71,7 @@ class ScheduleTest(BaseTest): self.first_inventory_source.source = 'ec2' self.first_inventory_source.save() - Permission.objects.create( - inventory = self.first_inventory, - user = self.other_django_user, - permission_type = 'read' - ) + self.first_inventory.auditor_role.members.add(self.other_django_user) self.second_inventory = Inventory.objects.create(name='test_inventory_2', description='for org 0', organization=self.organizations[0]) self.second_inventory.hosts.create(name='host_2') @@ -139,11 +135,7 @@ class ScheduleTest(BaseTest): self.post(first_url, data=unauth_schedule, expect=403) #give normal user write access and then they can post - Permission.objects.create( - user = self.other_django_user, - inventory = self.first_inventory, - permission_type = PERM_INVENTORY_WRITE - ) + self.first_inventory.admin_role.members.add(self.other_django_user) auth_schedule = unauth_schedule with self.current_user(self.other_django_user): self.post(first_url, data=auth_schedule, expect=201)