Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1933)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py

Issue 473473003: Remove virtual/softwarecompositing suite (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 4 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
« no previous file with comments | « Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py ('k') | Tools/Scripts/webkitpy/layout_tests/port/base.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
diff --git a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
index 7e6313809757f9166b09497a14e5b87ab896cc3d..962cf8bfebe76c6c6bf3d1872bea218819bfaddc 100644
--- a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
+++ b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
@@ -128,7 +128,7 @@ class BaselineOptimizerTest(unittest.TestCase):
self.assertTrue(not fs.exists(path) or path in baseline_optimizer._files_to_delete)
if expected_files_to_delete:
- self.assertEqual(baseline_optimizer._files_to_delete, expected_files_to_delete)
+ self.assertEqual(sorted(baseline_optimizer._files_to_delete), sorted(expected_files_to_delete))
def test_linux_redundant_with_win(self):
self._assertOptimization({
@@ -221,60 +221,60 @@ class BaselineOptimizerTest(unittest.TestCase):
def test_virtual_root_redundant_with_actual_root(self):
self._assertOptimization({
- 'virtual/softwarecompositing': '2',
- 'compositing': '2',
+ 'virtual/gpu/fast/canvas': '2',
+ 'fast/canvas': '2',
}, {
- 'virtual/softwarecompositing': None,
- 'compositing': '2',
- }, baseline_dirname='virtual/softwarecompositing')
+ 'virtual/gpu/fast/canvas': None,
+ 'fast/canvas': '2',
+ }, baseline_dirname='virtual/gpu/fast/canvas')
def test_virtual_root_redundant_with_ancestors(self):
self._assertOptimization({
- 'virtual/softwarecompositing': '2',
- 'platform/mac/compositing': '2',
- 'platform/win/compositing': '2',
+ 'virtual/gpu/fast/canvas': '2',
+ 'platform/mac/fast/canvas': '2',
+ 'platform/win/fast/canvas': '2',
}, {
- 'virtual/softwarecompositing': None,
- 'compositing': '2',
- }, baseline_dirname='virtual/softwarecompositing')
+ 'virtual/gpu/fast/canvas': None,
+ 'fast/canvas': '2',
+ }, baseline_dirname='virtual/gpu/fast/canvas')
def test_virtual_root_redundant_with_ancestors_skip_scm_commands(self):
self._assertOptimization({
- 'virtual/softwarecompositing': '2',
- 'platform/mac/compositing': '2',
- 'platform/win/compositing': '2',
+ 'virtual/gpu/fast/canvas': '2',
+ 'platform/mac/fast/canvas': '2',
+ 'platform/win/fast/canvas': '2',
}, {
- 'virtual/softwarecompositing': None,
- 'compositing': '2',
+ 'virtual/gpu/fast/canvas': None,
+ 'fast/canvas': '2',
},
- baseline_dirname='virtual/softwarecompositing',
+ baseline_dirname='virtual/gpu/fast/canvas',
expected_files_to_delete=[
- '/mock-checkout/third_party/WebKit/LayoutTests/virtual/softwarecompositing/mock-baseline-expected.txt',
- '/mock-checkout/third_party/WebKit/LayoutTests/platform/mac/compositing/mock-baseline-expected.txt',
- '/mock-checkout/third_party/WebKit/LayoutTests/platform/win/compositing/mock-baseline-expected.txt',
+ '/mock-checkout/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/mock-baseline-expected.txt',
+ '/mock-checkout/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/mock-baseline-expected.txt',
+ '/mock-checkout/third_party/WebKit/LayoutTests/platform/win/fast/canvas/mock-baseline-expected.txt',
])
def test_virtual_root_redundant_with_ancestors_skip_scm_commands_with_file_not_in_scm(self):
self._assertOptimization({
- 'virtual/softwarecompositing': '2',
- 'platform/mac/compositing': '2',
- 'platform/win/compositing': '2',
+ 'virtual/gpu/fast/canvas': '2',
+ 'platform/mac/fast/canvas': '2',
+ 'platform/win/fast/canvas': '2',
}, {
- 'virtual/softwarecompositing': None,
- 'compositing': '2',
+ 'virtual/gpu/fast/canvas': None,
+ 'fast/canvas': '2',
},
- baseline_dirname='virtual/softwarecompositing',
+ baseline_dirname='virtual/gpu/fast/canvas',
expected_files_to_delete=[
- '/mock-checkout/third_party/WebKit/LayoutTests/platform/mac/compositing/mock-baseline-expected.txt',
- '/mock-checkout/third_party/WebKit/LayoutTests/platform/win/compositing/mock-baseline-expected.txt',
+ '/mock-checkout/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/mock-baseline-expected.txt',
+ '/mock-checkout/third_party/WebKit/LayoutTests/platform/win/fast/canvas/mock-baseline-expected.txt',
],
- host=MockHost(scm=ExcludingMockSCM(['/mock-checkout/third_party/WebKit/LayoutTests/virtual/softwarecompositing/mock-baseline-expected.txt'])))
+ host=MockHost(scm=ExcludingMockSCM(['/mock-checkout/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/mock-baseline-expected.txt'])))
def test_virtual_root_not_redundant_with_ancestors(self):
self._assertOptimization({
- 'virtual/softwarecompositing': '2',
- 'platform/mac/compositing': '1',
+ 'virtual/gpu/fast/canvas': '2',
+ 'platform/mac/fast/canvas': '1',
}, {
- 'virtual/softwarecompositing': '2',
- 'platform/mac/compositing': '1',
- }, baseline_dirname='virtual/softwarecompositing')
+ 'virtual/gpu/fast/canvas': '2',
+ 'platform/mac/fast/canvas': '1',
+ }, baseline_dirname='virtual/gpu/fast/canvas')
« no previous file with comments | « Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py ('k') | Tools/Scripts/webkitpy/layout_tests/port/base.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698