| Index: Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
|
| diff --git a/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py b/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
|
| index 56bf798376ab8863f69251431a45fc32c5c0e475..5b150c959354ea888d50c30efbb656d809874205 100644
|
| --- a/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
|
| +++ b/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
|
| @@ -52,12 +52,14 @@ def get_options(args):
|
|
|
|
|
| class TestUtilityFunctions(unittest.TestCase):
|
| +
|
| def test_print_options(self):
|
| options, args = get_options([])
|
| self.assertIsNotNone(options)
|
|
|
|
|
| class FakeRunResults(object):
|
| +
|
| def __init__(self, total=1, expected=1, unexpected=0, fake_results=None):
|
| fake_results = fake_results or []
|
| self.total = total
|
| @@ -74,12 +76,14 @@ class FakeRunResults(object):
|
|
|
|
|
| class FakeShard(object):
|
| +
|
| def __init__(self, shard_name, total_run_time):
|
| self.shard_name = shard_name
|
| self.total_run_time = total_run_time
|
|
|
|
|
| -class Testprinter(unittest.TestCase):
|
| +class Testprinter(unittest.TestCase):
|
| +
|
| def assertEmpty(self, stream):
|
| self.assertFalse(stream.getvalue())
|
|
|
| @@ -152,20 +156,23 @@ class Testprinter(unittest.TestCase):
|
|
|
| run_results = FakeRunResults()
|
| run_results.results_by_name = {
|
| - "slowShard": FakeShard("slowShard", 16),
|
| - "borderlineShard": FakeShard("borderlineShard", 15),
|
| - "fastShard": FakeShard("fastShard", 1),
|
| + 'slowShard': FakeShard('slowShard', 16),
|
| + 'borderlineShard': FakeShard('borderlineShard', 15),
|
| + 'fastShard': FakeShard('fastShard', 1),
|
| }
|
|
|
| printer._print_directory_timings(run_results)
|
| - self.assertWritten(err, ['Time to process slowest subdirectories:\n', ' slowShard took 16.0 seconds to run 1 tests.\n', '\n'])
|
| + self.assertWritten(err,
|
| + ['Time to process slowest subdirectories:\n',
|
| + ' slowShard took 16.0 seconds to run 1 tests.\n',
|
| + '\n'])
|
|
|
| printer, err = self.get_printer()
|
| printer._options.debug_rwt_logging = True
|
|
|
| run_results.results_by_name = {
|
| - "borderlineShard": FakeShard("borderlineShard", 15),
|
| - "fastShard": FakeShard("fastShard", 1),
|
| + 'borderlineShard': FakeShard('borderlineShard', 15),
|
| + 'fastShard': FakeShard('fastShard', 1),
|
| }
|
|
|
| printer._print_directory_timings(run_results)
|
| @@ -180,42 +187,52 @@ class Testprinter(unittest.TestCase):
|
| self.assertWritten(err, result)
|
|
|
| # Without times:
|
| - run_test(1, 1, 0, [], ["The test ran as expected.\n", "\n"])
|
| - run_test(2, 1, 1, [], ["\n", "1 test ran as expected, 1 didn't:\n", "\n"])
|
| - run_test(3, 2, 1, [], ["\n", "2 tests ran as expected, 1 didn't:\n", "\n"])
|
| - run_test(3, 2, 0, [], ["\n", "2 tests ran as expected (1 didn't run).\n", "\n"])
|
| + run_test(1, 1, 0, [], ['The test ran as expected.\n', '\n'])
|
| + run_test(2, 1, 1, [], ['\n', "1 test ran as expected, 1 didn't:\n", '\n'])
|
| + run_test(3, 2, 1, [], ['\n', "2 tests ran as expected, 1 didn't:\n", '\n'])
|
| + run_test(3, 2, 0, [], ['\n', "2 tests ran as expected (1 didn't run).\n", '\n'])
|
|
|
| # With times:
|
| - fake_shards = [FakeShard("foo", 1), FakeShard("bar", 2)]
|
| - run_test(1, 1, 0, fake_shards, ["The test ran as expected in 5.00s (2.00s in rwt, 1x).\n", "\n"])
|
| - run_test(2, 1, 1, fake_shards, ["\n", "1 test ran as expected, 1 didn't in 5.00s (2.00s in rwt, 1x):\n", "\n"])
|
| - run_test(3, 2, 1, fake_shards, ["\n", "2 tests ran as expected, 1 didn't in 5.00s (2.00s in rwt, 1x):\n", "\n"])
|
| - run_test(3, 2, 0, fake_shards, ["\n", "2 tests ran as expected (1 didn't run) in 5.00s (2.00s in rwt, 1x).\n", "\n"])
|
| + fake_shards = [FakeShard('foo', 1), FakeShard('bar', 2)]
|
| + run_test(1, 1, 0, fake_shards, ['The test ran as expected in 5.00s (2.00s in rwt, 1x).\n', '\n'])
|
| + run_test(2, 1, 1, fake_shards, ['\n', "1 test ran as expected, 1 didn't in 5.00s (2.00s in rwt, 1x):\n", '\n'])
|
| + run_test(3, 2, 1, fake_shards, ['\n', "2 tests ran as expected, 1 didn't in 5.00s (2.00s in rwt, 1x):\n", '\n'])
|
| + run_test(3, 2, 0, fake_shards, ['\n', "2 tests ran as expected (1 didn't run) in 5.00s (2.00s in rwt, 1x).\n", '\n'])
|
|
|
| def test_test_status_line(self):
|
| printer, _ = self.get_printer()
|
| printer._meter.number_of_columns = lambda: 80
|
| - actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
|
| + actual = printer._test_status_line(
|
| + 'fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html',
|
| + ' passed')
|
| self.assertEqual(80, len(actual))
|
| self.assertEqual(actual, '[0/0] fast/dom/HTMLFormElement/associa...after-index-assertion-fail1.html passed')
|
|
|
| printer._meter.number_of_columns = lambda: 89
|
| - actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
|
| + actual = printer._test_status_line(
|
| + 'fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html',
|
| + ' passed')
|
| self.assertEqual(89, len(actual))
|
| self.assertEqual(actual, '[0/0] fast/dom/HTMLFormElement/associated-...ents-after-index-assertion-fail1.html passed')
|
|
|
| - printer._meter.number_of_columns = lambda: sys.maxint
|
| - actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
|
| + printer._meter.number_of_columns = lambda: sys.maxsize
|
| + actual = printer._test_status_line(
|
| + 'fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html',
|
| + ' passed')
|
| self.assertEqual(90, len(actual))
|
| self.assertEqual(actual, '[0/0] fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html passed')
|
|
|
| printer._meter.number_of_columns = lambda: 18
|
| - actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
|
| + actual = printer._test_status_line(
|
| + 'fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html',
|
| + ' passed')
|
| self.assertEqual(18, len(actual))
|
| self.assertEqual(actual, '[0/0] f...l passed')
|
|
|
| printer._meter.number_of_columns = lambda: 10
|
| - actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
|
| + actual = printer._test_status_line(
|
| + 'fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html',
|
| + ' passed')
|
| self.assertEqual(actual, '[0/0] associated-elements-after-index-assertion-fail1.html passed')
|
|
|
| def test_details(self):
|
| @@ -229,11 +246,11 @@ class Testprinter(unittest.TestCase):
|
| printer, err = self.get_printer()
|
|
|
| printer.print_found(100, 10, 1, 1)
|
| - self.assertWritten(err, ["Found 100 tests; running 10, skipping 90.\n"])
|
| + self.assertWritten(err, ['Found 100 tests; running 10, skipping 90.\n'])
|
|
|
| self.reset(err)
|
| printer.print_found(100, 10, 2, 3)
|
| - self.assertWritten(err, ["Found 100 tests; running 10 (6 times each: --repeat-each=2 --iterations=3), skipping 90.\n"])
|
| + self.assertWritten(err, ['Found 100 tests; running 10 (6 times each: --repeat-each=2 --iterations=3), skipping 90.\n'])
|
|
|
| def test_debug_rwt_logging_is_throttled(self):
|
| printer, err = self.get_printer(['--debug-rwt-logging'])
|
|
|