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

Fix so command tests will work on Django 1.4.x.

Browse Source
This commit is contained in:
Chris Church
2013-07-27 00:21:45 -04:00
parent 2c166e501e
commit d78bc8fb19
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,6 +146,10 @@ class BaseCommandTest(BaseTest):
sys.stdin = original_stdin sys.stdin = original_stdin
sys.stdout = original_stdout sys.stdout = original_stdout
sys.stderr = original_stderr sys.stderr = original_stderr
# For Django 1.4.x, convert sys.exit(1) and stderr message to the
# CommandError(msg) exception used by Django 1.5 and later.
if isinstance(result, SystemExit) and captured_stderr:
result = CommandError(captured_stderr)
return result, captured_stdout, captured_stderr return result, captured_stdout, captured_stderr
class CleanupDeletedTest(BaseCommandTest): class CleanupDeletedTest(BaseCommandTest):