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

fix some patches that were never unapplied

Browse Source
This commit is contained in:
AlanCoding
2019-02-20 14:40:25 -05:00
parent 07def62373
commit 711937b104
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
awx/main/tests/unit/test_tasks.py
View File

@@ -528,10 +528,8 @@ class TestGenericRun(TestJobExecution):
self.task.run(self.pk) self.task.run(self.pk)
def test_awx_task_env(self): def test_awx_task_env(self):
patch = mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', {'FOO': 'BAR'}) with mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', {'FOO': 'BAR'}):
patch.start() self.task.run(self.pk)
self.task.run(self.pk)
assert self.run_pexpect.call_count == 1 assert self.run_pexpect.call_count == 1
call_args, _ = self.run_pexpect.call_args_list[0] call_args, _ = self.run_pexpect.call_args_list[0]
@@ -584,16 +582,11 @@ class TestGenericRun(TestJobExecution):
[{'ANSIBLE_LIBRARY': '/foo/bar'}, '/foo/bar:/awx_devel/awx/plugins/library'], [{'ANSIBLE_LIBRARY': '/foo/bar'}, '/foo/bar:/awx_devel/awx/plugins/library'],
]) ])
def test_fact_cache_usage_with_ansible_library(self, task_env, ansible_library_env): def test_fact_cache_usage_with_ansible_library(self, task_env, ansible_library_env):
patch = mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', task_env)
patch.start()
self.instance.use_fact_cache = True self.instance.use_fact_cache = True
start_mock = mock.Mock() with mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', task_env):
patch = mock.patch.object(Job, 'start_job_fact_cache', start_mock) start_mock = mock.Mock()
self.patches.append(patch) with mock.patch.object(Job, 'start_job_fact_cache', start_mock):
patch.start() self.task.run(self.pk)
self.task.run(self.pk)
call_args, _ = self.run_pexpect.call_args_list[0] call_args, _ = self.run_pexpect.call_args_list[0]
args, cwd, env, stdout = call_args args, cwd, env, stdout = call_args
assert env['ANSIBLE_LIBRARY'] == ansible_library_env assert env['ANSIBLE_LIBRARY'] == ansible_library_env
@@ -1682,10 +1675,8 @@ class TestJobCredentials(TestJobExecution):
assert self.instance.job_env['AZURE_PASSWORD'] == tasks.HIDDEN_PASSWORD assert self.instance.job_env['AZURE_PASSWORD'] == tasks.HIDDEN_PASSWORD
def test_awx_task_env(self): def test_awx_task_env(self):
patch = mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', {'FOO': 'BAR'}) with mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', {'FOO': 'BAR'}):
patch.start() self.task.run(self.pk)
self.task.run(self.pk)
assert self.run_pexpect.call_count == 1 assert self.run_pexpect.call_count == 1
call_args, _ = self.run_pexpect.call_args_list[0] call_args, _ = self.run_pexpect.call_args_list[0]
@@ -1800,10 +1791,8 @@ class TestProjectUpdateCredentials(TestJobExecution):
def test_awx_task_env(self, scm_type): def test_awx_task_env(self, scm_type):
self.instance.scm_type = scm_type self.instance.scm_type = scm_type
patch = mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', {'FOO': 'BAR'}) with mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', {'FOO': 'BAR'}):
patch.start() self.task.run(self.pk)
self.task.run(self.pk)
assert self.run_pexpect.call_count == 1 assert self.run_pexpect.call_count == 1
call_args, _ = self.run_pexpect.call_args_list[0] call_args, _ = self.run_pexpect.call_args_list[0]
@@ -2274,10 +2263,8 @@ class TestInventoryUpdateCredentials(TestJobExecution):
return cred return cred
self.instance.get_cloud_credential = get_cred self.instance.get_cloud_credential = get_cred
patch = mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', {'FOO': 'BAR'}) with mock.patch('awx.main.tasks.settings.AWX_TASK_ENV', {'FOO': 'BAR'}):
patch.start() self.task.run(self.pk)
self.task.run(self.pk)
assert self.run_pexpect.call_count == 1 assert self.run_pexpect.call_count == 1
call_args, _ = self.run_pexpect.call_args_list[0] call_args, _ = self.run_pexpect.call_args_list[0]