Show More
@@ -1437,22 +1437,28 b' class TextTestRunner(unittest.TextTestRu' | |||||
1437 | try: |
|
1437 | try: | |
1438 | timesd = {} |
|
1438 | timesd = {} | |
1439 | for test, cuser, csys, real in result.times: |
|
1439 | for test, cuser, csys, real in result.times: | |
1440 | timesd[test] = real |
|
1440 | timesd[test] = (real, cuser, csys) | |
1441 |
|
1441 | |||
1442 | outcome = {} |
|
1442 | outcome = {} | |
1443 | for tc in result.successes: |
|
1443 | for tc in result.successes: | |
1444 | testresult = {'result': 'success', |
|
1444 | testresult = {'result': 'success', | |
1445 |
'time': ('%0.3f' % timesd[tc.name]) |
|
1445 | 'time': ('%0.3f' % timesd[tc.name][0]), | |
|
1446 | 'cuser': ('%0.3f' % timesd[tc.name][1]), | |||
|
1447 | 'csys': ('%0.3f' % timesd[tc.name][2])} | |||
1446 | outcome[tc.name] = testresult |
|
1448 | outcome[tc.name] = testresult | |
1447 |
|
1449 | |||
1448 | for tc, err in sorted(result.faildata.iteritems()): |
|
1450 | for tc, err in sorted(result.faildata.iteritems()): | |
1449 | testresult = {'result': 'failure', |
|
1451 | testresult = {'result': 'failure', | |
1450 |
'time': ('%0.3f' % timesd[tc]) |
|
1452 | 'time': ('%0.3f' % timesd[tc][0]), | |
|
1453 | 'cuser': ('%0.3f' % timesd[tc][1]), | |||
|
1454 | 'csys': ('%0.3f' % timesd[tc][2])} | |||
1451 | outcome[tc] = testresult |
|
1455 | outcome[tc] = testresult | |
1452 |
|
1456 | |||
1453 | for tc, reason in result.skipped: |
|
1457 | for tc, reason in result.skipped: | |
1454 | testresult = {'result': 'skip', |
|
1458 | testresult = {'result': 'skip', | |
1455 |
'time': ('%0.3f' % timesd[tc.name]) |
|
1459 | 'time': ('%0.3f' % timesd[tc.name][0]), | |
|
1460 | 'cuser': ('%0.3f' % timesd[tc.name][1]), | |||
|
1461 | 'csys': ('%0.3f' % timesd[tc.name][2])} | |||
1456 | outcome[tc.name] = testresult |
|
1462 | outcome[tc.name] = testresult | |
1457 |
|
1463 | |||
1458 | jsonout = json.dumps(outcome, sort_keys=True, indent=4) |
|
1464 | jsonout = json.dumps(outcome, sort_keys=True, indent=4) |
@@ -394,14 +394,20 b' test for --json' | |||||
394 | $ cat report.json |
|
394 | $ cat report.json | |
395 | testreport ={ |
|
395 | testreport ={ | |
396 | "test-failure.t": [\{] (re) |
|
396 | "test-failure.t": [\{] (re) | |
|
397 | "csys": "\s*[\d\.]{5}", (re) | |||
|
398 | "cuser": "\s*[\d\.]{5}", (re) | |||
397 | "result": "failure", |
|
399 | "result": "failure", | |
398 | "time": "\s*[\d\.]{5}" (re) |
|
400 | "time": "\s*[\d\.]{5}" (re) | |
399 | }, |
|
401 | }, | |
400 | "test-skip.t": { |
|
402 | "test-skip.t": { | |
|
403 | "csys": "\s*[\d\.]{5}", (re) | |||
|
404 | "cuser": "\s*[\d\.]{5}", (re) | |||
401 | "result": "skip", |
|
405 | "result": "skip", | |
402 | "time": "\s*[\d\.]{5}" (re) |
|
406 | "time": "\s*[\d\.]{5}" (re) | |
403 | }, |
|
407 | }, | |
404 | "test-success.t": [\{] (re) |
|
408 | "test-success.t": [\{] (re) | |
|
409 | "csys": "\s*[\d\.]{5}", (re) | |||
|
410 | "cuser": "\s*[\d\.]{5}", (re) | |||
405 | "result": "success", |
|
411 | "result": "success", | |
406 | "time": "\s*[\d\.]{5}" (re) |
|
412 | "time": "\s*[\d\.]{5}" (re) | |
407 | } |
|
413 | } |
General Comments 0
You need to be logged in to leave comments.
Login now