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

Merge branch 'master' into vagrant-unstable

Browse Source 
Conflicts:
	awx/api/tests/job_tasks.py
	awx/api/utils/decorators.py
This commit is contained in:
Luke Sneeringer
2014-06-19 14:20:34 -05:00
parent c8e5892d54 0fb2160d0f
commit 5d528e2db8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/tests/job_tasks.py
View File

@@ -50,7 +50,7 @@ class JobTasksTests(BaseJobTestMixin, LiveServerTestCase):
# Test to make sure we got back what we expected. # Test to make sure we got back what we expected.
result = response['results'][0] result = response['results'][0]
self.assertEqual(result['host_count'], 1) self.assertEqual(result['host_count'], 7)
self.assertEqual(result['changed_count'], 1) self.assertEqual(result['changed_count'], 7)
self.assertFalse(result['failed']) self.assertFalse(result['failed'])
self.assertTrue(result['changed']) self.assertTrue(result['changed'])