Ported old/unified_jobs.py

awx/main/tests/functional/api/test_unified_jobs_view.py

@@ -60,7 +60,6 @@ def test_project_update_redaction_enabled(get, format, content_type, test_cases,
         job = test_data['project']
         response = get(reverse("api:project_update_stdout", args=(job.pk,)) + "?format=" + format, user=admin, expect=200, accept=content_type)
         assert content_type in response['CONTENT-TYPE']
-        print(response.data)
         assert response.data is not None
         content = response.data['content'] if format == 'json' else response.data
         assert test_data['uri'].username not in content
@@ -90,3 +89,5 @@ def test_options_fields_choices(instance, options, user):
     assert UnifiedJob.LAUNCH_TYPE_CHOICES == response.data['actions']['GET']['launch_type']['choices']
     assert 'choice' == response.data['actions']['GET']['status']['type']
     assert UnifiedJob.STATUS_CHOICES == response.data['actions']['GET']['status']['choices']
+
+

awx/main/tests/old/unified_jobs.py

@@ -1,55 +0,0 @@
-# Copyright (c) 2015 Ansible, Inc.
-# All Rights Reserved
-
-# Python
-import mock
-from mock import Mock
-from StringIO import StringIO
-from django.utils.timezone import now
-
-# Django
-from django.test import SimpleTestCase
-
-# AWX
-from awx.main.models import * # noqa
-
-__all__ = ['UnifiedJobsUnitTest',]
-
-class UnifiedJobsUnitTest(SimpleTestCase):
-
-    # stdout file present
-    @mock.patch('os.path.exists', return_value=True)
-    @mock.patch('codecs.open', return_value='my_file_handler')
-    def test_result_stdout_raw_handle_file__found(self, exists, open):
-        unified_job = UnifiedJob()
-        unified_job.result_stdout_file = 'dummy'
-
-        with mock.patch('os.stat', return_value=Mock(st_size=1)):
-            result = unified_job.result_stdout_raw_handle()
-
-        self.assertEqual(result, 'my_file_handler')
-
-    # stdout file missing, job finished
-    @mock.patch('os.path.exists', return_value=False)
-    def test_result_stdout_raw_handle__missing(self, exists):
-        unified_job = UnifiedJob()
-        unified_job.result_stdout_file = 'dummy'
-        unified_job.finished = now()
-
-        result = unified_job.result_stdout_raw_handle()
-
-        self.assertIsInstance(result, StringIO)
-        self.assertEqual(result.read(), 'stdout capture is missing')
-
-    # stdout file missing, job not finished
-    @mock.patch('os.path.exists', return_value=False)
-    def test_result_stdout_raw_handle__pending(self, exists):
-        unified_job = UnifiedJob()
-        unified_job.result_stdout_file = 'dummy'
-        unified_job.finished = None
-
-        result = unified_job.result_stdout_raw_handle()
-
-        self.assertIsInstance(result, StringIO)
-        self.assertEqual(result.read(), 'Waiting for results...')
-

awx/main/tests/unit/test_unified_jobs.py

@@ -0,0 +1,48 @@
+# Copyright (c) 2015 Ansible, Inc.
+# All Rights Reserved
+
+# Python
+import mock
+from mock import Mock
+from StringIO import StringIO
+from django.utils.timezone import now
+
+# AWX
+from awx.main.models import UnifiedJob
+
+
+# stdout file present
+@mock.patch('os.path.exists', return_value=True)
+@mock.patch('codecs.open', return_value='my_file_handler')
+def test_result_stdout_raw_handle_file__found(exists, open):
+    unified_job = UnifiedJob()
+    unified_job.result_stdout_file = 'dummy'
+
+    with mock.patch('os.stat', return_value=Mock(st_size=1)):
+        result = unified_job.result_stdout_raw_handle()
+
+    assert result == 'my_file_handler'
+
+# stdout file missing, job finished
+@mock.patch('os.path.exists', return_value=False)
+def test_result_stdout_raw_handle__missing(exists):
+    unified_job = UnifiedJob()
+    unified_job.result_stdout_file = 'dummy'
+    unified_job.finished = now()
+
+    result = unified_job.result_stdout_raw_handle()
+
+    assert isinstance(result, StringIO)
+    assert result.read() == 'stdout capture is missing'
+
+# stdout file missing, job not finished
+@mock.patch('os.path.exists', return_value=False)
+def test_result_stdout_raw_handle__pending(exists):
+    unified_job = UnifiedJob()
+    unified_job.result_stdout_file = 'dummy'
+    unified_job.finished = None
+
+    result = unified_job.result_stdout_raw_handle()
+
+    assert isinstance(result, StringIO)
+    assert result.read() == 'Waiting for results...'