Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations_unittest.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations_unittest.py |
index bb63f84cde25d79a4dc4300276522547c9ef6bf6..4f75ca156d896c9d7565c05afd422dd31dbb7a5c 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations_unittest.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations_unittest.py |
@@ -35,7 +35,7 @@ class FakeBotTestExpectationsFactory(object): |
PASS PASS FAIL PASS TIMEOUT |
then _all_results_by_builder would be: |
{ |
- 'WebKit Linux' : { |
+ 'WebKit Linux Precise' : { |
Dirk Pranke
2016/09/16 22:39:57
Ideally we'd change these test cases to refer to a
jeffcarp
2016/09/21 19:21:50
That sounds good but sounds like it should be in a
|
'mytest.html': ['FAIL', 'PASS', 'TIMEOUT'] |
} |
} |
@@ -154,7 +154,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) test/f.html [ NeedsRebaseline ]""" |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -164,7 +164,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS"], |
"test/b.html": ["PASS", "PASS"], |
"test/c.html": ["PASS", "PASS"], |
@@ -192,7 +192,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) test/c.html [ Skip ]""" |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -202,7 +202,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS"], |
"test/b.html": ["PASS", "IMAGE"], |
} |
@@ -222,7 +222,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) test/c.html [ Failure NeedsManualRebaseline Pass ]""" |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -232,7 +232,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS"], |
"test/b.html": ["PASS", "PASS"], |
"test/c.html": ["PASS", "PASS"] |
@@ -256,7 +256,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) test/f.html [ Failure Pass ]""") |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -266,7 +266,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "IMAGE"], |
"test/b.html": ["PASS", "TEXT"], |
"test/c.html": ["PASS", "IMAGE+TEXT"], |
@@ -300,7 +300,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) test/c.html [ Crash Pass ]""") |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -310,7 +310,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
"test/b.html": ["PASS", "IMAGE", "PASS"], |
"test/c.html": ["PASS", "CRASH", "PASS"], |
@@ -329,7 +329,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) test/a.html [ Failure Pass ]""") |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -339,7 +339,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["IMAGE", "IMAGE", "IMAGE"], |
} |
} |
@@ -354,7 +354,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
test_expectations_before = "" |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -364,7 +364,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
} |
} |
@@ -383,7 +383,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) test/c.html [ Failure Pass ]""") |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -399,7 +399,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
"test/b.html": ["PASS", "PASS", "PASS"], |
"test/c.html": ["AUDIO", "AUDIO", "AUDIO"], |
@@ -435,7 +435,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
"port_name": "win-win7", |
"specifiers": ['Win7', 'Release'] |
}, |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -451,7 +451,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
"test/b.html": ["PASS", "PASS", "PASS"], |
"test/c.html": ["PASS", "PASS", "PASS"], |
@@ -501,11 +501,11 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
"port_name": "win-win7", |
"specifiers": ['Win7', 'Debug'] |
}, |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
- "WebKit Linux (dbg)": { |
+ "WebKit Linux Precise (dbg)": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Debug'] |
}, |
@@ -516,14 +516,14 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
"test/b.html": ["PASS", "IMAGE", "PASS"], |
"test/c.html": ["PASS", "IMAGE", "PASS"], |
"test/d.html": ["PASS", "PASS", "PASS"], |
"test/e.html": ["PASS", "PASS", "PASS"], |
}, |
- 'WebKit Linux (dbg)': { |
+ 'WebKit Linux Precise (dbg)': { |
"test/a.html": ["PASS", "IMAGE", "PASS"], |
"test/b.html": ["PASS", "PASS", "PASS"], |
"test/c.html": ["PASS", "PASS", "PASS"], |
@@ -595,7 +595,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) test/e.html [ Failure Pass ]""" |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -605,7 +605,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
"test/b.html": ["PASS", "PASS", "PASS"], |
"test/c.html": ["PASS", "IMAGE", "PASS"], |
@@ -645,7 +645,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) test/e.html [ Crash Pass ]""" |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -655,7 +655,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
} |
} |
updated_expectations = ( |
@@ -686,7 +686,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) [ Linux Release ] test/e.html [ Failure Pass ]""" |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
@@ -704,7 +704,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
"test/b.html": ["PASS", "PASS", "PASS"], |
"test/c.html": ["PASS", "IMAGE", "PASS"], |
@@ -743,11 +743,11 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
Bug(test) [ Linux ] test/d.html [ Failure ]""" |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
- "WebKit Linux (dbg)": { |
+ "WebKit Linux Precise (dbg)": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Debug'] |
}, |
@@ -774,7 +774,7 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
self._parse_expectations(test_expectations_before) |
self._expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
"test/b.html": ["PASS", "IMAGE", "PASS"], |
"test/c.html": ["PASS", "PASS", "PASS"], |
@@ -791,9 +791,9 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
updated_expectations = ( |
self._flake_remover.get_updated_test_expectations()) |
self.assertLog([ |
- 'WARNING: Downloaded results are missing results for builder "WebKit Linux (dbg)"\n', |
+ 'WARNING: Downloaded results are missing results for builder "WebKit Linux Precise (dbg)"\n', |
'WARNING: Downloaded results are missing results for builder "WebKit Win7"\n', |
- 'ERROR: Failed to find results for builder "WebKit Linux (dbg)"\n', |
+ 'ERROR: Failed to find results for builder "WebKit Linux Precise (dbg)"\n', |
'ERROR: Failed to find results for builder "WebKit Win7"\n', |
]) |
@@ -806,11 +806,11 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
"""Tests that the call harness updates the TestExpectations file.""" |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
- "WebKit Linux (dbg)": { |
+ "WebKit Linux Precise (dbg)": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Debug'] |
}, |
@@ -843,13 +843,13 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
# Write out the fake builder bot results. |
expectation_factory = FakeBotTestExpectationsFactory() |
expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
"test/b.html": ["PASS", "IMAGE", "PASS"], |
"test/c.html": ["PASS", "PASS", "PASS"], |
"test/d.html": ["PASS", "PASS", "PASS"], |
}, |
- 'WebKit Linux (dbg)': { |
+ 'WebKit Linux Precise (dbg)': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
"test/b.html": ["PASS", "PASS", "PASS"], |
"test/c.html": ["PASS", "PASS", "PASS"], |
@@ -904,11 +904,11 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
""" |
self._define_builders({ |
- "WebKit Linux": { |
+ "WebKit Linux Precise": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Release'] |
}, |
- "WebKit Linux (dbg)": { |
+ "WebKit Linux Precise (dbg)": { |
"port_name": "linux-precise", |
"specifiers": ['Precise', 'Debug'] |
}, |
@@ -936,10 +936,10 @@ class UpdateTestExpectationsTest(LoggingTestCase): |
# Write out the fake builder bot results. |
expectation_factory = FakeBotTestExpectationsFactory() |
expectation_factory._all_results_by_builder = { |
- 'WebKit Linux': { |
+ 'WebKit Linux Precise': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
}, |
- 'WebKit Linux (dbg)': { |
+ 'WebKit Linux Precise (dbg)': { |
"test/a.html": ["PASS", "PASS", "PASS"], |
}, |
} |