External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 21:20:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix to use awx/lib/site-packages for all tasks, avoid using amqp broker for unit tests.

Browse Source
This commit is contained in:
Chris Church
2013-12-11 10:45:54 -05:00
parent c850379222
commit 4abb595a1f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/tasks.py
View File

@@ -125,6 +125,12 @@ class BaseTask(Task):
# Set environment variables needed for inventory and job event # Set environment variables needed for inventory and job event
# callbacks to work. # callbacks to work.
env['ANSIBLE_NOCOLOR'] = '1' # Prevent output of escape sequences. env['ANSIBLE_NOCOLOR'] = '1' # Prevent output of escape sequences.
# Update PYTHONPATH to use local site-packages.
python_paths = env.get('PYTHONPATH', '').split(os.pathsep)
local_site_packages = self.get_path_to('..', 'lib', 'site-packages')
if local_site_packages not in python_paths:
python_paths.insert(0, local_site_packages)
env['PYTHONPATH'] = os.pathsep.join(python_paths)
return env return env
def build_safe_env(self, instance, **kwargs): def build_safe_env(self, instance, **kwargs):
@@ -799,12 +805,6 @@ class RunInventoryUpdate(BaseTask):
Build environment dictionary for inventory import. Build environment dictionary for inventory import.
''' '''
env = super(RunInventoryUpdate, self).build_env(inventory_update, **kwargs) env = super(RunInventoryUpdate, self).build_env(inventory_update, **kwargs)
# Update PYTHONPATH to use local site-packages for inventory scripts.
python_paths = env.get('PYTHONPATH', '').split(os.pathsep)
local_site_packages = self.get_path_to('..', 'lib', 'site-packages')
if local_site_packages not in python_paths:
python_paths.insert(0, local_site_packages)
env['PYTHONPATH'] = os.pathsep.join(python_paths)
# Pass inventory source ID to inventory script. # Pass inventory source ID to inventory script.
inventory_source = inventory_update.inventory_source inventory_source = inventory_update.inventory_source
env['INVENTORY_SOURCE_ID'] = str(inventory_source.pk) env['INVENTORY_SOURCE_ID'] = str(inventory_source.pk)

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

@@ -47,6 +47,10 @@ class BaseTestMixin(object):
# commands that run from tests. # commands that run from tests.
for opt in ('ENGINE', 'NAME', 'USER', 'PASSWORD', 'HOST', 'PORT'): for opt in ('ENGINE', 'NAME', 'USER', 'PASSWORD', 'HOST', 'PORT'):
os.environ['AWX_TEST_DATABASE_%s' % opt] = settings.DATABASES['default'][opt] os.environ['AWX_TEST_DATABASE_%s' % opt] = settings.DATABASES['default'][opt]
# For now, prevent tests from trying to use celery for job event
# callbacks.
if settings.BROKER_URL.startswith('amqp://'):
settings.BROKER_URL = 'django://'
# Make temp job status directory for unit tests. # Make temp job status directory for unit tests.
job_status_dir = tempfile.mkdtemp() job_status_dir = tempfile.mkdtemp()
self._temp_project_dirs.append(job_status_dir) self._temp_project_dirs.append(job_status_dir)