mirror of
https://github.com/ansible/awx.git
synced 2024-11-02 09:51:09 +03:00
Merge pull request #1233 from ryanpetrello/fix-1215
more gracefully account for undefined stdout
This commit is contained in:
commit
0359c4ed98
@ -885,6 +885,7 @@ class BaseTask(LogErrorsTask):
|
||||
output_replacements = []
|
||||
extra_update_fields = {}
|
||||
event_ct = 0
|
||||
stdout_handle = None
|
||||
try:
|
||||
kwargs['isolated'] = isolated_host is not None
|
||||
self.pre_run_hook(instance, **kwargs)
|
||||
|
@ -13,6 +13,7 @@ import fcntl
|
||||
import mock
|
||||
import pytest
|
||||
import yaml
|
||||
|
||||
from django.conf import settings
|
||||
|
||||
|
||||
@ -295,6 +296,15 @@ class TestJobExecution:
|
||||
|
||||
class TestGenericRun(TestJobExecution):
|
||||
|
||||
def test_generic_failure(self):
|
||||
self.task.build_private_data_files = mock.Mock(side_effect=IOError())
|
||||
with pytest.raises(Exception):
|
||||
self.task.run(self.pk)
|
||||
update_model_call = self.task.update_model.call_args[1]
|
||||
assert 'IOError' in update_model_call['result_traceback']
|
||||
assert update_model_call['status'] == 'error'
|
||||
assert update_model_call['emitted_events'] == 0
|
||||
|
||||
def test_cancel_flag(self):
|
||||
self.instance.cancel_flag = True
|
||||
with pytest.raises(Exception):
|
||||
|
Loading…
Reference in New Issue
Block a user