Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py - Issue 20830003: Get rid of the distinction between modifiers and expectations.

Unified Diff: Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py

Issue 20830003: Get rid of the distinction between modifiers and expectations. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: clean up a couple things Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py ('K') | « Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py ('k') | Tools/Scripts/webkitpy/style/checkers/test_expectations.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py b/Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py

index 49608969ae6afa24c4fdf6d61d7d53de31f924bc..a09cbc4ea7f1b74c2a274d88c66932b944f70437 100644

--- a/Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py

+++ b/Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py

@@ -80,7 +80,7 @@ def summarized_results(port, expected, passing, flaky, only_include_failing=Fals

initial_results.add(get_result('failures/expected/crash.html', test_expectations.TIMEOUT), expected, test_is_slow)

# we only list hang.html here, since normally this is WontFix

- initial_results.add(get_result('failures/expected/hang.html', test_expectations.TIMEOUT), expected, test_is_slow)

+ initial_results.add(get_result('failures/expected/hang.html', test_expectations.SKIP), expected, test_is_slow)

if flaky:

retry_results = run_results(port, extra_skipped_tests)

@@ -126,13 +126,13 @@ class SummarizedResultsTest(unittest.TestCase):

def test_num_failures_by_type(self):

summary = summarized_results(self.port, expected=False, passing=False, flaky=False)

- self.assertEquals(summary['num_failures_by_type'], {'CRASH': 1, 'MISSING': 0, 'TEXT': 0, 'IMAGE': 0, 'NEEDSREBASELINE': 0, 'NEEDSMANUALREBASELINE': 0, 'PASS': 0, 'SKIP': 0, 'TIMEOUT': 2, 'IMAGE+TEXT': 0, 'FAIL': 0, 'AUDIO': 1})

+ self.assertEquals(summary['num_failures_by_type'], {'CRASH': 1, 'MISSING': 0, 'TEXT': 0, 'IMAGE': 0, 'NEEDSREBASELINE': 0, 'NEEDSMANUALREBASELINE': 0, 'PASS': 0, 'REBASELINE': 0, 'SKIP': 0, 'SLOW': 0, 'TIMEOUT': 2, 'IMAGE+TEXT': 0, 'FAIL': 0, 'AUDIO': 1, 'WONTFIX': 0})

summary = summarized_results(self.port, expected=True, passing=False, flaky=False)

- self.assertEquals(summary['num_failures_by_type'], {'CRASH': 1, 'MISSING': 0, 'TEXT': 0, 'IMAGE': 0, 'NEEDSREBASELINE': 0, 'NEEDSMANUALREBASELINE': 0, 'PASS': 1, 'SKIP': 0, 'TIMEOUT': 1, 'IMAGE+TEXT': 0, 'FAIL': 0, 'AUDIO': 1})

+ self.assertEquals(summary['num_failures_by_type'], {'CRASH': 1, 'MISSING': 0, 'TEXT': 0, 'IMAGE': 0, 'NEEDSREBASELINE': 0, 'NEEDSMANUALREBASELINE': 0, 'PASS': 1, 'REBASELINE': 0, 'SKIP': 0, 'SLOW': 0, 'TIMEOUT': 1, 'IMAGE+TEXT': 0, 'FAIL': 0, 'AUDIO': 1, 'WONTFIX': 0})

summary = summarized_results(self.port, expected=False, passing=True, flaky=False)

- self.assertEquals(summary['num_failures_by_type'], {'CRASH': 0, 'MISSING': 0, 'TEXT': 0, 'IMAGE': 0, 'NEEDSREBASELINE': 0, 'NEEDSMANUALREBASELINE': 0, 'PASS': 4, 'SKIP': 1, 'TIMEOUT': 0, 'IMAGE+TEXT': 0, 'FAIL': 0, 'AUDIO': 0})

+ self.assertEquals(summary['num_failures_by_type'], {'CRASH': 0, 'MISSING': 0, 'TEXT': 0, 'IMAGE': 0, 'NEEDSREBASELINE': 0, 'NEEDSMANUALREBASELINE': 0, 'PASS': 4, 'REBASELINE': 0, 'SKIP': 1, 'SLOW': 0, 'TIMEOUT': 0, 'IMAGE+TEXT': 0, 'FAIL': 0, 'AUDIO': 0, 'WONTFIX': 0})

def test_svn_revision(self):

self.port._options.builder_name = 'dummy builder'