From 6549a0225bd3a5b6032348dace3aab496ec16a44 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Mon, 14 Mar 2016 16:28:24 -0400 Subject: [PATCH] Various org.admins -> org.admin_role.members transformations --- .../functional/api/test_fact_versions.py | 20 +++++++++---------- .../tests/functional/api/test_fact_view.py | 6 +++--- awx/main/tests/old/ad_hoc.py | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/awx/main/tests/functional/api/test_fact_versions.py b/awx/main/tests/functional/api/test_fact_versions.py index dfb067a1f8..5aab13764a 100644 --- a/awx/main/tests/functional/api/test_fact_versions.py +++ b/awx/main/tests/functional/api/test_fact_versions.py @@ -92,7 +92,7 @@ def test_basic_fields(hosts, fact_scans, get, user): } (host, response) = setup_common(hosts, fact_scans, get, user, epoch=epoch, get_params=search) - + results = response.data['results'] assert 'related' in results[0] assert 'timestamp' in results[0] @@ -118,12 +118,12 @@ def test_basic_options_fields(hosts, fact_scans, options, user): @pytest.mark.django_db def test_related_fact_view(hosts, fact_scans, get, user): epoch = timezone.now() - + (host, response) = setup_common(hosts, fact_scans, get, user, epoch=epoch) facts_known = Fact.get_timeline(host.id) assert 9 == len(facts_known) assert 9 == len(response.data['results']) - + for i, fact_known in enumerate(facts_known): check_url(response.data['results'][i]['related']['fact_view'], fact_known, fact_known.module) @@ -131,12 +131,12 @@ def test_related_fact_view(hosts, fact_scans, get, user): @pytest.mark.django_db def test_multiple_hosts(hosts, fact_scans, get, user): epoch = timezone.now() - + (host, response) = setup_common(hosts, fact_scans, get, user, epoch=epoch, host_count=3) facts_known = Fact.get_timeline(host.id) assert 9 == len(facts_known) assert 9 == len(response.data['results']) - + for i, fact_known in enumerate(facts_known): check_url(response.data['results'][i]['related']['fact_view'], fact_known, fact_known.module) @@ -153,7 +153,7 @@ def test_param_to_from(hosts, fact_scans, get, user): facts_known = Fact.get_timeline(host.id, ts_from=search['from'], ts_to=search['to']) assert 9 == len(facts_known) assert 9 == len(response.data['results']) - + check_response_facts(facts_known, response) @mock.patch('awx.api.views.feature_enabled', new=mock_feature_enabled) @@ -168,7 +168,7 @@ def test_param_module(hosts, fact_scans, get, user): facts_known = Fact.get_timeline(host.id, module=search['module']) assert 3 == len(facts_known) assert 3 == len(response.data['results']) - + check_response_facts(facts_known, response) @mock.patch('awx.api.views.feature_enabled', new=mock_feature_enabled) @@ -183,7 +183,7 @@ def test_param_from(hosts, fact_scans, get, user): facts_known = Fact.get_timeline(host.id, ts_from=search['from']) assert 3 == len(facts_known) assert 3 == len(response.data['results']) - + check_response_facts(facts_known, response) @mock.patch('awx.api.views.feature_enabled', new=mock_feature_enabled) @@ -198,7 +198,7 @@ def test_param_to(hosts, fact_scans, get, user): facts_known = Fact.get_timeline(host.id, ts_to=search['to']) assert 6 == len(facts_known) assert 6 == len(response.data['results']) - + check_response_facts(facts_known, response) def _test_user_access_control(hosts, fact_scans, get, user_obj, team_obj): @@ -235,7 +235,7 @@ def test_super_user_ok(hosts, fact_scans, get, user, team): @pytest.mark.django_db def test_user_admin_ok(organization, hosts, fact_scans, get, user, team): user_admin = user('johnson', False) - organization.admins.add(user_admin) + organization.admin_role.members.add(user_admin) response = _test_user_access_control(hosts, fact_scans, get, user_admin, team) diff --git a/awx/main/tests/functional/api/test_fact_view.py b/awx/main/tests/functional/api/test_fact_view.py index ad96d48aee..054a323844 100644 --- a/awx/main/tests/functional/api/test_fact_view.py +++ b/awx/main/tests/functional/api/test_fact_view.py @@ -87,7 +87,7 @@ def test_basic_fields(hosts, fact_scans, get, user): assert 'description' in response.data['summary_fields']['host'] assert 'host' in response.data['related'] assert reverse('api:host_detail', args=(hosts[0].pk,)) == response.data['related']['host'] - + @mock.patch('awx.api.views.feature_enabled', new=mock_feature_enabled) @pytest.mark.django_db def test_content(hosts, fact_scans, get, user, fact_ansible_json): @@ -103,7 +103,7 @@ def _test_search_by_module(hosts, fact_scans, get, user, fact_json, module_name) 'module': module_name } (fact_known, response) = setup_common(hosts, fact_scans, get, user, module_name=module_name, get_params=params) - + assert fact_json == json.loads(response.data['facts']) assert timestamp_apiformat(fact_known.timestamp) == response.data['timestamp'] assert module_name == response.data['module'] @@ -162,7 +162,7 @@ def test_super_user_ok(hosts, fact_scans, get, user, team): @pytest.mark.django_db def test_user_admin_ok(organization, hosts, fact_scans, get, user, team): user_admin = user('johnson', False) - organization.admins.add(user_admin) + organization.admin_role.members.add(user_admin) response = _test_user_access_control(hosts, fact_scans, get, user_admin, team) diff --git a/awx/main/tests/old/ad_hoc.py b/awx/main/tests/old/ad_hoc.py index a912f7a89b..52e22faf21 100644 --- a/awx/main/tests/old/ad_hoc.py +++ b/awx/main/tests/old/ad_hoc.py @@ -39,7 +39,7 @@ class BaseAdHocCommandTest(BaseJobExecutionTest): self.setup_instances() self.setup_users() self.organization = self.make_organizations(self.super_django_user, 1)[0] - self.organization.admins.add(self.normal_django_user) + self.organization.admin_role.members.add(self.normal_django_user) self.inventory = self.organization.inventories.create(name='test-inventory', description='description for test-inventory') self.host = self.inventory.hosts.create(name='host.example.com') self.host2 = self.inventory.hosts.create(name='host2.example.com')