comparison tests/run-tests.py @ 24983:277bc9b0b4bd

run-tests: when building json, get time data in the same order as elsewhere

The json code was changing the order of the time tuple for unclear reasons. We
now use the same order as everywhere else.

24982:5c15f7e0f52b

            fp = open(jsonpath, 'w')
            try:
                timesd = {}
                for tdata in result.times:
                    test = tdata[0]
                    real, cuser, csys = tdata[3], tdata[1], tdata[2]
                    timesd[test] = (real, cuser, csys)

                outcome = {}
                groups = [('success', ((tc, None) for tc in result.successes)),
                          ('failure', result.failures),
                          ('skip', result.skipped)]
                for res, testcases in groups:
                    for tc, __ in testcases:
                        testresult = {'result': res,
                                      'time': ('%0.3f' % timesd[tc.name][0]),
                                      'cuser': ('%0.3f' % timesd[tc.name][1]),
                                      'csys': ('%0.3f' % timesd[tc.name][2])}
                        outcome[tc.name] = testresult

                jsonout = json.dumps(outcome, sort_keys=True, indent=4)
                fp.writelines(("testreport =", jsonout))
            finally:

24983:277bc9b0b4bd

            fp = open(jsonpath, 'w')
            try:
                timesd = {}
                for tdata in result.times:
                    test = tdata[0]
                    timesd[test] = tdata[1:]

                outcome = {}
                groups = [('success', ((tc, None) for tc in result.successes)),
                          ('failure', result.failures),
                          ('skip', result.skipped)]
                for res, testcases in groups:
                    for tc, __ in testcases:
                        testresult = {'result': res,
                                      'time': ('%0.3f' % timesd[tc.name][2]),
                                      'cuser': ('%0.3f' % timesd[tc.name][0]),
                                      'csys': ('%0.3f' % timesd[tc.name][1])}
                        outcome[tc.name] = testresult

                jsonout = json.dumps(outcome, sort_keys=True, indent=4)
                fp.writelines(("testreport =", jsonout))
            finally: