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

Fix all but one unit test.

Browse Source
This commit is contained in:
Luke Sneeringer
2014-11-07 14:26:31 -06:00
parent ec55603e3f
commit ed34d5f469
8 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/management/commands/run_callback_receiver.py
View File

@@ -68,7 +68,7 @@ class CallbackReceiver(object):
main_process = Process( main_process = Process(
target=self.callback_handler, target=self.callback_handler,
args=(use_workers, worker_queues,), args=(use_workers, worker_queues,)
) )
main_process.daemon = True main_process.daemon = True
main_process.start() main_process.start()
@@ -146,7 +146,6 @@ class CallbackReceiver(object):
# queue_actual_worker[2] = w # queue_actual_worker[2] = w
last_parent_events[message['job_id']] = job_parent_events last_parent_events[message['job_id']] = job_parent_events
self.consumer_subscriber.send("1")
def process_job_event(self, data): def process_job_event(self, data):
# Sanity check: Do we need to do anything at all? # Sanity check: Do we need to do anything at all?

2
awx/main/tasks.py
View File

@@ -191,7 +191,7 @@ class BaseTask(Task):
# Log out the error to the debug logger. # Log out the error to the debug logger.
logger.debug('Database error updating %s, retrying in 5 ' logger.debug('Database error updating %s, retrying in 5 '
'seconds (retry #%d): %s', 'seconds (retry #%d): %s',
self.model._meta.object_name, retry_count + 1, e) self.model._meta.object_name, _attempt + 1, e)
# Attempt to retry the update, assuming we haven't already # Attempt to retry the update, assuming we haven't already
# tried too many times. # tried too many times.

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

@@ -452,10 +452,10 @@ class BaseTestMixin(object):
if hasattr(self, 'taskmanager_process'): if hasattr(self, 'taskmanager_process'):
self.taskmanager_process.terminate() self.taskmanager_process.terminate()
def start_queue(self, consumer_port, queue_port): def start_queue(self):
receiver = CallbackReceiver() receiver = CallbackReceiver()
self.queue_process = Process(target=receiver.run_subscriber, self.queue_process = Process(target=receiver.run_subscriber,
args=(consumer_port, queue_port, False,)) args=(False,))
self.queue_process.start() self.queue_process.start()
def terminate_queue(self): def terminate_queue(self):

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

@@ -304,8 +304,7 @@ class CleanupJobsTest(BaseCommandMixin, BaseLiveServerTest):
self.project = None self.project = None
self.credential = None self.credential = None
settings.INTERNAL_API_URL = self.live_server_url settings.INTERNAL_API_URL = self.live_server_url
if settings.CALLBACK_CONSUMER_PORT: self.start_queue()
self.start_queue(settings.CALLBACK_CONSUMER_PORT, settings.CALLBACK_QUEUE_PORT)
def tearDown(self): def tearDown(self):
super(CleanupJobsTest, self).tearDown() super(CleanupJobsTest, self).tearDown()

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

@@ -1087,7 +1087,7 @@ class InventoryUpdatesTest(BaseTransactionTest):
self.group = self.inventory.groups.create(name='Cloud Group') self.group = self.inventory.groups.create(name='Cloud Group')
self.inventory2 = self.organization.inventories.create(name='Cloud Inventory 2') self.inventory2 = self.organization.inventories.create(name='Cloud Inventory 2')
self.group2 = self.inventory2.groups.create(name='Cloud Group 2') self.group2 = self.inventory2.groups.create(name='Cloud Group 2')
self.start_queue(settings.CALLBACK_CONSUMER_PORT, settings.CALLBACK_QUEUE_PORT) self.start_queue()
def tearDown(self): def tearDown(self):
super(InventoryUpdatesTest, self).tearDown() super(InventoryUpdatesTest, self).tearDown()

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

@@ -680,8 +680,7 @@ class BaseJobTestMixin(BaseTestMixin):
def setUp(self): def setUp(self):
super(BaseJobTestMixin, self).setUp() super(BaseJobTestMixin, self).setUp()
self.populate() self.populate()
if settings.CALLBACK_CONSUMER_PORT: self.start_queue()
self.start_queue(settings.CALLBACK_CONSUMER_PORT, settings.CALLBACK_QUEUE_PORT)
def tearDown(self): def tearDown(self):
super(BaseJobTestMixin, self).tearDown() super(BaseJobTestMixin, self).tearDown()

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

@@ -734,7 +734,7 @@ class ProjectUpdatesTest(BaseTransactionTest):
def setUp(self): def setUp(self):
super(ProjectUpdatesTest, self).setUp() super(ProjectUpdatesTest, self).setUp()
self.start_queue(settings.CALLBACK_CONSUMER_PORT, settings.CALLBACK_QUEUE_PORT) self.start_queue()
self.setup_users() self.setup_users()
def tearDown(self): def tearDown(self):

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

@@ -360,8 +360,7 @@ class RunJobTest(BaseCeleryTest):
self.credential = None self.credential = None
self.cloud_credential = None self.cloud_credential = None
settings.INTERNAL_API_URL = self.live_server_url settings.INTERNAL_API_URL = self.live_server_url
if settings.CALLBACK_CONSUMER_PORT: self.start_queue()
self.start_queue(settings.CALLBACK_CONSUMER_PORT, settings.CALLBACK_QUEUE_PORT)
def tearDown(self): def tearDown(self):
super(RunJobTest, self).tearDown() super(RunJobTest, self).tearDown()