TAP without YAML is valid for importing, it's just not valid for
submitting results to resultsdb. If you want to import some TAP stub
and postprocess it later, we should not crash in those cases.
test suite passes
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | libtaskotron/check.py (2 lines) | |||
| M | testing/test_check.py (43 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| c0f0d8d1b424 | c51790895f7c | 4831c9c2adff | Kamil Páral | check: fix crash during yaml-less TAP import (Show More…) | Mar 25 2015, 1:20 PM |
| Show First 20 Lines • Show All 343 Lines • ▼ Show 20 Line(s) | 337 | def import_TAP(source): | |||
|---|---|---|---|---|---|
| 344 | tap = TAP13() | 344 | tap = TAP13() | ||
| 345 | try: | 345 | try: | ||
| 346 | tap.parse(source) | 346 | tap.parse(source) | ||
| 347 | except ValueError as e: | 347 | except ValueError as e: | ||
| 348 | raise exc.TaskotronValueError('Failed to parse TAP contents: %s' % e) | 348 | raise exc.TaskotronValueError('Failed to parse TAP contents: %s' % e) | ||
| 349 | 349 | | |||
| 350 | check_details = [] | 350 | check_details = [] | ||
| 351 | for test in tap.tests: | 351 | for test in tap.tests: | ||
| 352 | y = test.yaml | 352 | y = test.yaml or {} | ||
| 353 | item = y.get('item', None) | 353 | item = y.get('item', None) | ||
| 354 | report_type = y.get('type', None) | 354 | report_type = y.get('type', None) | ||
| 355 | outcome = 'PASSED' if test.result == 'ok' else 'FAILED' | 355 | outcome = 'PASSED' if test.result == 'ok' else 'FAILED' | ||
| 356 | outcome = y.get('outcome', outcome) | 356 | outcome = y.get('outcome', outcome) | ||
| 357 | summary = y.get('summary', '') | 357 | summary = y.get('summary', '') | ||
| 358 | details = y.get('details', {}) | 358 | details = y.get('details', {}) | ||
| 359 | output = details.get('output', None) | 359 | output = details.get('output', None) | ||
| 360 | if output is not None: | 360 | if output is not None: | ||
| Show All 13 Lines | |||||
| Show First 20 Lines • Show All 177 Lines • ▼ Show 20 Line(s) | 174 | def test_create_multi_item_summary_raise(self): | |||
|---|---|---|---|---|---|
| 178 | with pytest.raises(exc.TaskotronValueError): | 178 | with pytest.raises(exc.TaskotronValueError): | ||
| 179 | assert check.CheckDetail.create_multi_item_summary('PASSED') | 179 | assert check.CheckDetail.create_multi_item_summary('PASSED') | ||
| 180 | 180 | | |||
| 181 | 181 | | |||
| 182 | class TestExportTAP(object): | 182 | class TestExportTAP(object): | ||
| 183 | '''Test @method export_TAP''' | 183 | '''Test @method export_TAP''' | ||
| 184 | item = 'xchat-0.5-1.fc20' | 184 | item = 'xchat-0.5-1.fc20' | ||
| 185 | outcome = 'PASSED' | 185 | outcome = 'PASSED' | ||
| 186 | summary='5 ERRORS, 10 WARNINGS' | 186 | summary = '5 ERRORS, 10 WARNINGS' | ||
| 187 | report_type=check.ReportType.KOJI_BUILD | 187 | report_type = check.ReportType.KOJI_BUILD | ||
| 188 | output = '''\ | 188 | output = '''\ | ||
| 189 | xchat.x86_64: W: file-not-utf8 /usr/share/doc/xchat/ChangeLog | 189 | xchat.x86_64: W: file-not-utf8 /usr/share/doc/xchat/ChangeLog | ||
| 190 | xchat.x86_64: W: non-conffile-in-etc /etc/gconf/schemas/apps_xchat_url_handler.schemas | 190 | xchat.x86_64: W: non-conffile-in-etc /etc/gconf/schemas/apps_xchat_url_handler.schemas | ||
| 191 | xchat.x86_64: W: no-manual-page-for-binary xchat''' | 191 | xchat.x86_64: W: no-manual-page-for-binary xchat''' | ||
| 192 | keyvals = {"foo": "bar", "moo": 11} | 192 | keyvals = {"foo": "bar", "moo": 11} | ||
| 193 | 193 | | |||
| 194 | def setup_method(self, method): | 194 | def setup_method(self, method): | ||
| 195 | self.cd = check.CheckDetail(item=self.item, outcome=self.outcome, | 195 | self.cd = check.CheckDetail(item=self.item, outcome=self.outcome, | ||
| ▲ Show 20 Lines • Show All 157 Lines • ▼ Show 20 Line(s) | 346 | def test_checkname(self): | |||
| 353 | assert "ok - $CHECKNAME for" not in output | 353 | assert "ok - $CHECKNAME for" not in output | ||
| 354 | assert "ok - my_beautifull_check_name for" in output | 354 | assert "ok - my_beautifull_check_name for" in output | ||
| 355 | 355 | | |||
| 356 | 356 | | |||
| 357 | class TestImportTAP(object): | 357 | class TestImportTAP(object): | ||
| 358 | '''Test @method import_TAP''' | 358 | '''Test @method import_TAP''' | ||
| 359 | item = 'xchat-0.5-1.fc20' | 359 | item = 'xchat-0.5-1.fc20' | ||
| 360 | outcome = 'PASSED' | 360 | outcome = 'PASSED' | ||
| 361 | summary='5 ERRORS, 10 WARNINGS' | 361 | summary = '5 ERRORS, 10 WARNINGS' | ||
| 362 | report_type=check.ReportType.KOJI_BUILD | 362 | report_type = check.ReportType.KOJI_BUILD | ||
| 363 | output = '''\ | 363 | output = '''\ | ||
| 364 | xchat.x86_64: W: file-not-utf8 /usr/share/doc/xchat/ChangeLog | 364 | xchat.x86_64: W: file-not-utf8 /usr/share/doc/xchat/ChangeLog | ||
| 365 | xchat.x86_64: W: non-conffile-in-etc /etc/gconf/schemas/apps_xchat_url_handler.schemas | 365 | xchat.x86_64: W: non-conffile-in-etc /etc/gconf/schemas/apps_xchat_url_handler.schemas | ||
| 366 | xchat.x86_64: W: no-manual-page-for-binary xchat''' | 366 | xchat.x86_64: W: no-manual-page-for-binary xchat''' | ||
| 367 | keyvals = {"foo": "bar", "moo": 11} | 367 | keyvals = {"foo": "bar", "moo": 11} | ||
| 368 | 368 | | |||
| 369 | tap_output = """ | 369 | tap_output = """ | ||
| 370 | TAP version 13 | 370 | TAP version 13 | ||
| ▲ Show 20 Lines • Show All 73 Lines • ▼ Show 20 Line(s) | |||||
| 444 | ok - $CHECKNAME for YYY | 444 | ok - $CHECKNAME for YYY | ||
| 445 | --- | 445 | --- | ||
| 446 | item: YYY | 446 | item: YYY | ||
| 447 | ... | 447 | ... | ||
| 448 | """ | 448 | """ | ||
| 449 | with pytest.raises(ValueError): | 449 | with pytest.raises(ValueError): | ||
| 450 | check.import_TAP(tap_output_multi_header) | 450 | check.import_TAP(tap_output_multi_header) | ||
| 451 | 451 | | |||
| 452 | def test_no_yaml(self): | ||||
| 453 | tap_output = ''' | ||||
| 454 | TAP version 13 | ||||
| 455 | 1..1 | ||||
| 456 | ok''' | ||||
| 457 | cds = check.import_TAP(tap_output) | ||||
| 458 | assert len(cds) == 1 | ||||
| 459 | assert isinstance(cds[0], check.CheckDetail) | ||||
| 460 | | ||||
| 461 | cd = cds[0] | ||||
| 462 | assert not cd.item | ||||
| 463 | assert cd.outcome == 'PASSED' | ||||
| 464 | assert not cd.summary | ||||
| 465 | assert not cd.report_type | ||||
| 466 | assert not cd.output | ||||
| 467 | assert not cd.keyvals | ||||
| 468 | | ||||
| 469 | def test_empty_yaml(self): | ||||
| 470 | tap_output = ''' | ||||
| 471 | TAP version 13 | ||||
| 472 | 1..1 | ||||
| 473 | not ok | ||||
| 474 | --- | ||||
| 475 | ...''' | ||||
| 476 | cds = check.import_TAP(tap_output) | ||||
| 477 | assert len(cds) == 1 | ||||
| 478 | assert isinstance(cds[0], check.CheckDetail) | ||||
| 479 | | ||||
| 480 | cd = cds[0] | ||||
| 481 | assert not cd.item | ||||
| 482 | assert cd.outcome == 'FAILED' | ||||
| 483 | assert not cd.summary | ||||
| 484 | assert not cd.report_type | ||||
| 485 | assert not cd.output | ||||
| 486 | assert not cd.keyvals | ||||
y = test.yaml if test.yaml else {} ;)