Changeset 129055 in webkit
- Timestamp:
- Sep 19, 2012 3:48:03 PM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r129052 r129055 1 2012-09-19 Ryosuke Niwa <rniwa@webkit.org> 2 3 REGRESSION: run-perf-tests no longer reports the total test time 4 https://bugs.webkit.org/show_bug.cgi?id=97138 5 6 Reviewed by Tony Chang. 7 8 Report the finished time as a info-level log as opposed to a debug level log. 9 10 * Scripts/webkitpy/performance_tests/perftestsrunner.py: 11 (PerfTestsRunner._run_single_test): 12 * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py: 13 (MainTest.normalizeFinishedTime): Added. It replaces all finished times by 0.1 seconds. 14 (test_run_test_pause_before_testing): 15 (test_run_test_set_for_parser_tests): 16 (test_run_memory_test): 17 (_test_run_with_json_output): 18 1 19 2012-09-19 Dirk Pranke <dpranke@chromium.org> 2 20 -
trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py
r128511 r129055 318 318 _log.error('FAILED') 319 319 320 _log. debug("Finished: %f s" % (time.time() - start_time))320 _log.info("Finished: %f s" % (time.time() - start_time)) 321 321 322 322 return new_results != None -
trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
r128511 r129055 32 32 import StringIO 33 33 import json 34 import re 34 35 import unittest 35 36 … … 48 49 def assertWritten(self, stream, contents): 49 50 self.assertEquals(stream.buflist, contents) 51 52 def normalizeFinishedTime(self, log): 53 return re.sub(r'Finished: [0-9\.]+ s', 'Finished: 0.1 s', log) 50 54 51 55 class TestDriver: … … 235 239 stdout, stderr, log = output.restore_output() 236 240 self.assertEqual(stderr, "Ready to run test?\n") 237 self.assertEqual(log, "Running inspector/pass.html (1 of 1)\nRESULT group_name: test_name= 42 ms\n\n") 241 self.assertEqual(self.normalizeFinishedTime(log), 242 "Running inspector/pass.html (1 of 1)\nRESULT group_name: test_name= 42 ms\nFinished: 0.1 s\n\n") 238 243 239 244 def test_run_test_set_for_parser_tests(self): … … 247 252 stdout, stderr, log = output.restore_output() 248 253 self.assertEqual(unexpected_result_count, 0) 249 self.assertEqual( log, '\n'.join(['Running Bindings/event-target-wrapper.html (1 of 2)',254 self.assertEqual(self.normalizeFinishedTime(log), '\n'.join(['Running Bindings/event-target-wrapper.html (1 of 2)', 250 255 'RESULT Bindings: event-target-wrapper= 1489.05 ms', 251 256 'median= 1487.0 ms, stdev= 14.46 ms, min= 1471.0 ms, max= 1510.0 ms', 257 'Finished: 0.1 s', 252 258 '', 253 259 'Running Parser/some-parser.html (2 of 2)', 254 260 'RESULT Parser: some-parser= 1100.0 ms', 255 261 'median= 1101.0 ms, stdev= 11.0 ms, min= 1080.0 ms, max= 1120.0 ms', 262 'Finished: 0.1 s', 256 263 '', ''])) 257 264 … … 268 275 stdout, stderr, log = output.restore_output() 269 276 self.assertEqual(unexpected_result_count, 0) 270 self.assertEqual( log, '\n'.join([277 self.assertEqual(self.normalizeFinishedTime(log), '\n'.join([ 271 278 'Running 1 tests', 272 279 'Running Parser/memory-test.html (1 of 1)', … … 277 284 'RESULT Parser: memory-test: Malloc= 532000.0 bytes', 278 285 'median= 529000.0 bytes, stdev= 13000.0 bytes, min= 511000.0 bytes, max= 548000.0 bytes', 286 'Finished: 0.1 s', 279 287 '', ''])) 280 288 results = runner.load_output_json()[0]['results'] … … 305 313 306 314 if not expected_exit_code: 307 self.assertEqual( logs, '\n'.join([308 ' Running 2 tests',315 self.assertEqual(self.normalizeFinishedTime(logs), 316 '\n'.join(['Running 2 tests', 309 317 'Running Bindings/event-target-wrapper.html (1 of 2)', 310 318 'RESULT Bindings: event-target-wrapper= 1489.05 ms', 311 319 'median= 1487.0 ms, stdev= 14.46 ms, min= 1471.0 ms, max= 1510.0 ms', 320 'Finished: 0.1 s', 312 321 '', 313 322 'Running inspector/pass.html (2 of 2)', 314 323 'RESULT group_name: test_name= 42 ms', 324 'Finished: 0.1 s', 315 325 '', 316 326 '']))
Note: See TracChangeset
for help on using the changeset viewer.