diff options
| author | Jonathan Lange <jml@mumak.net> | 2015-11-02 20:03:49 +0000 |
|---|---|---|
| committer | Jonathan Lange <jml@mumak.net> | 2015-11-09 13:27:19 +0000 |
| commit | cb266059b8882207f353a5d5899c661a2c1e86a2 (patch) | |
| tree | c54bfc15089d0004bb284ec4336e41fb8991125e | |
| parent | 528d86c2e4ca4653b9239b3f006a210e554583a7 (diff) | |
| download | testtools-cb266059b8882207f353a5d5899c661a2c1e86a2.tar.gz | |
Move test_dict_to_case closer to test_dict definition
| -rw-r--r-- | testtools/testresult/real.py | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/testtools/testresult/real.py b/testtools/testresult/real.py index f82667a..c33c1c6 100644 --- a/testtools/testresult/real.py +++ b/testtools/testresult/real.py @@ -721,6 +721,33 @@ class TestRecord(PRecord): return case +_status_map = { + 'inprogress': 'addFailure', + 'unknown': 'addFailure', + 'success': 'addSuccess', + 'skip': 'addSkip', + 'fail': 'addFailure', + 'xfail': 'addExpectedFailure', + 'uxsuccess': 'addUnexpectedSuccess', + } + + +def test_dict_to_case(test_dict): + """Convert a test dict into a TestCase object. + + :param test_dict: A test dict as generated by StreamToDict. + :return: A PlaceHolder test object. + """ + # Circular import. + global PlaceHolder + if PlaceHolder is None: + from testtools.testcase import PlaceHolder + outcome = _status_map[test_dict['status']] + return PlaceHolder( + test_dict['id'], outcome=outcome, details=test_dict['details'], + tags=test_dict['tags'], timestamps=test_dict['timestamps']) + + class StreamToDict(StreamResult): """A specialised StreamResult that emits a callback as tests complete. @@ -832,33 +859,6 @@ def _make_content_type(mime_type=None): return ContentType(primary, sub, parameters) -_status_map = { - 'inprogress': 'addFailure', - 'unknown': 'addFailure', - 'success': 'addSuccess', - 'skip': 'addSkip', - 'fail': 'addFailure', - 'xfail': 'addExpectedFailure', - 'uxsuccess': 'addUnexpectedSuccess', - } - - -def test_dict_to_case(test_dict): - """Convert a test dict into a TestCase object. - - :param test_dict: A test dict as generated by StreamToDict. - :return: A PlaceHolder test object. - """ - # Circular import. - global PlaceHolder - if PlaceHolder is None: - from testtools.testcase import PlaceHolder - outcome = _status_map[test_dict['status']] - return PlaceHolder( - test_dict['id'], outcome=outcome, details=test_dict['details'], - tags=test_dict['tags'], timestamps=test_dict['timestamps']) - - class StreamSummary(StreamToDict): """A specialised StreamResult that summarises a stream. |
