shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #241 from chrismeyersfsu/fix-license_errors

Browse Source 
create enterprise license in tests
This commit is contained in:
Chris Meyers 2015-05-22 18:02:16 -04:00
commit f9fd8318ed
5 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tests/activity_stream.py
View File

@ -19,6 +19,8 @@ class ActivityStreamTest(BaseTest):
def setUp(self):
super(ActivityStreamTest, self).setUp()
self.setup_instances()
self.create_test_license_file()
# TODO: Test non-enterprise license
self.setup_users()
self.org_created = self.post(reverse('api:organization_list'), dict(name='test org', description='test descr'), expect=201, auth=self.get_super_credentials())

2
awx/main/tests/ad_hoc.py
View File

@ -911,6 +911,8 @@ class AdHocCommandApiTest(BaseAdHocCommandTest):
@mock.patch('awx.main.tasks.BaseTask.run_pexpect', side_effect=run_pexpect_mock)
def test_ad_hoc_command_activity_stream(self, ignore):
# TODO: Test non-enterprise license
self.create_test_license_file()
with self.current_user('admin'):
response = self.run_test_ad_hoc_command()

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

@ -179,7 +179,8 @@ class BaseTestMixin(QueueTestMixin, MockCommonlySlowTestMixin):
contact_name='AWX Admin',
contact_email='awx@example.com',
license_date=license_date,
instance_count=instance_count)
instance_count=instance_count,
license_type='enterprise')
handle, license_path = tempfile.mkstemp(suffix='.json')
os.close(handle)
writer.write_file(license_path)

2
awx/main/tests/jobs/jobs_monolithic.py
View File

@ -1020,6 +1020,8 @@ class JobTransactionTest(BaseJobTestMixin, django.test.LiveServerTestCase):
class JobTemplateSurveyTest(BaseJobTestMixin, django.test.TestCase):
def setUp(self):
super(JobTemplateSurveyTest, self).setUp()
# TODO: Test non-enterprise license
self.create_test_license_file()
def tearDown(self):
super(JobTemplateSurveyTest, self).tearDown()

2
awx/main/tests/organizations.py
View File

@ -13,6 +13,8 @@ class OrganizationsTest(BaseTest):
def setUp(self):
super(OrganizationsTest, self).setUp()
self.setup_instances()
# TODO: Test non-enterprise license
self.create_test_license_file()
self.setup_users()
self.organizations = self.make_organizations(self.super_django_user, 10)