External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 03:40:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix up unit tests for tracking system_uuid in the settings and database

Browse Source
This commit is contained in:
Matthew Jones 2014-11-17 14:14:07 -05:00
parent e99466efc2
commit eae8c48faa
12 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ class ActivityStreamTest(BaseTest):
def setUp(self):
super(ActivityStreamTest, self).setUp()
self.setup_instances()
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())

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

@ -69,6 +69,9 @@ class BaseTestMixin(object):
os.environ['AWX_TEST_DATABASE_%s' % opt] = settings.DATABASES['default'][opt]
# Set flag so that task chain works with unit tests.
settings.CELERY_UNIT_TEST = True
settings.SYSTEM_UUID='00000000-0000-0000-0000-000000000000'
settings.BROKER_URL='redis://localhost:16379/'
# Create unique random consumer and queue ports for zeromq callback.
if settings.CALLBACK_CONSUMER_PORT:
callback_port = random.randint(55700, 55799)
@ -214,6 +217,10 @@ class BaseTestMixin(object):
))
return results
def setup_instances(self):
instance = Instance(uuid=settings.SYSTEM_UUID, primary=True, ip_address='127.0.0.1')
instance.save()
def setup_users(self, just_super_user=False):
# Create a user.
self.super_username = 'admin'
@ -479,8 +486,6 @@ class BaseTestMixin(object):
self.redis_process = None
@override_settings(SYSTEM_UUID='00000000-0000-0000-0000-000000000000',
BROKER_URL='redis://localhost:16379/')
class BaseTest(BaseTestMixin, django.test.TestCase):
'''
Base class for unit tests.

1
awx/main/tests/commands.py
View File

@ -104,6 +104,7 @@ class BaseCommandMixin(object):
'''
def create_test_inventories(self):
self.setup_instances()
self.setup_users()
self.organizations = self.make_organizations(self.super_django_user, 2)
self.projects = self.make_projects(self.normal_django_user, 2)

1
awx/main/tests/inventory.py
View File

@ -28,6 +28,7 @@ class InventoryTest(BaseTest):
def setUp(self):
self.start_redis()
super(InventoryTest, self).setUp()
self.setup_instances()
self.setup_users()
self.organizations = self.make_organizations(self.super_django_user, 3)
self.organizations[0].admins.add(self.normal_django_user)

1
awx/main/tests/jobs.py
View File

@ -200,6 +200,7 @@ class BaseJobTestMixin(BaseTestMixin):
def setUp(self):
self.start_redis()
self.setup_instances()
super(BaseJobTestMixin, self).setUp()
def tearDown(self):

1
awx/main/tests/licenses.py
View File

@ -17,6 +17,7 @@ class LicenseTests(BaseTest):
def setUp(self):
self.start_redis()
self.setup_instances()
super(LicenseTests, self).setUp()
self.setup_users()
u = self.super_django_user

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

@ -18,6 +18,7 @@ class OrganizationsTest(BaseTest):
def setUp(self):
super(OrganizationsTest, self).setUp()
self.setup_instances()
self.setup_users()
self.organizations = self.make_organizations(self.super_django_user, 10)

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

@ -42,6 +42,7 @@ class ProjectsTest(BaseTransactionTest):
return reverse('api:project_list')
def setUp(self):
self.setup_instances()
super(ProjectsTest, self).setUp()
self.setup_users()

1
awx/main/tests/schedules.py
View File

@ -58,6 +58,7 @@ class ScheduleTest(BaseTest):
def setUp(self):
super(ScheduleTest, self).setUp()
self.start_redis()
self.setup_instances()
self.setup_users()
self.organizations = self.make_organizations(self.super_django_user, 2)
self.organizations[0].admins.add(self.normal_django_user)

1
awx/main/tests/scripts.py
View File

@ -69,6 +69,7 @@ class InventoryScriptTest(BaseScriptTest):
def setUp(self):
super(InventoryScriptTest, self).setUp()
self.start_redis()
self.setup_instances()
self.setup_users()
self.organizations = self.make_organizations(self.super_django_user, 2)
self.projects = self.make_projects(self.normal_django_user, 2)

1
awx/main/tests/tasks.py
View File

@ -358,6 +358,7 @@ class RunJobTest(BaseCeleryTest):
def setUp(self):
super(RunJobTest, self).setUp()
self.test_project_path = None
self.setup_instances()
self.setup_users()
self.organization = self.make_organizations(self.super_django_user, 1)[0]
self.inventory = self.organization.inventories.create(name='test-inventory',

1
awx/main/tests/users.py
View File

@ -26,6 +26,7 @@ class UsersTest(BaseTest):
return reverse('api:user_list')
def setUp(self):
self.setup_instances()
super(UsersTest, self).setUp()
self.setup_users()
self.organizations = self.make_organizations(self.super_django_user, 2)