Rename LayoutTests/imported/ -> LayoutTests/external/.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/update_w3c_test_expectations_unittest.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/update_w3c_test_expectations_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/update_w3c_test_expectations_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/update_w3c_test_expectations_unittest.py
index fca01909133bc08c6dffa0b842096d00910399bd..a2e7d02df8c5d58265c81e461d0cb1117f2cb306 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/update_w3c_test_expectations_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/update_w3c_test_expectations_unittest.py
@@ -28,18 +28,18 @@ class UpdateW3CTestExpectationsTest(LoggingTestCase):
             }
         }
         self.mock_dict_two = {
-            'imported/fake/test/path.html': {
+            'external/fake/test/path.html': {
                 'one': {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'},
                 'two': {'expected': 'FAIL', 'actual': 'TIMEOUT', 'bug': 'crbug.com/626703'},
                 'three': {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'}
             }
         }
         self.mock_dict_three = {
-            'imported/fake/test/path.html': {
+            'external/fake/test/path.html': {
                 'four': {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'}}
         }
         self.mock_dict_four = {
-            'imported/fake/test/path.html': {
+            'external/fake/test/path.html': {
                 'one': {'expected': 'FAIL', 'actual': 'TIMEOUT', 'bug': 'crbug.com/626703'}
             }
         }
@@ -104,7 +104,7 @@ class UpdateW3CTestExpectationsTest(LoggingTestCase):
             line_adder.merge_same_valued_keys(self.mock_dict_one['fake/test/path.html']),
             {('two', 'one'): {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'}})
         self.assertEqual(
-            line_adder.merge_same_valued_keys(self.mock_dict_two['imported/fake/test/path.html']),
+            line_adder.merge_same_valued_keys(self.mock_dict_two['external/fake/test/path.html']),
             {
                 ('three', 'one'): {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'},
                 'two': {'expected': 'FAIL', 'actual': 'TIMEOUT', 'bug': 'crbug.com/626703'}
@@ -137,9 +137,9 @@ class UpdateW3CTestExpectationsTest(LoggingTestCase):
         self.assertEqual(
             line_adder.create_line_list(self.mock_dict_two),
             [
-                'crbug.com/626703 [ three ] imported/fake/test/path.html [ Pass ]',
-                'crbug.com/626703 [ two ] imported/fake/test/path.html [ Timeout ]',
-                'crbug.com/626703 [ one ] imported/fake/test/path.html [ Pass ]',
+                'crbug.com/626703 [ three ] external/fake/test/path.html [ Pass ]',
+                'crbug.com/626703 [ two ] external/fake/test/path.html [ Timeout ]',
+                'crbug.com/626703 [ one ] external/fake/test/path.html [ Pass ]',
             ])
 
     def test_merge_dicts_with_conflict_raise_exception(self):
@@ -245,42 +245,42 @@ class UpdateW3CTestExpectationsTest(LoggingTestCase):
         self.assertFalse(line_adder.is_js_test('foo/bar.html'))
 
     def test_get_test_to_rebaseline_returns_only_tests_with_failures(self):
-        self.host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/imported/fake/test/path.html'] = (
+        self.host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/external/fake/test/path.html'] = (
             '<script src="/resources/testharness.js"></script>')
-        self.host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/imported/other/test/path.html'] = (
+        self.host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/external/other/test/path.html'] = (
             '<script src="/resources/testharness.js"></script>')
         line_adder = W3CExpectationsLineAdder(self.host)
         tests_to_rebaseline, _ = line_adder.get_tests_to_rebaseline(
-            ['imported/fake/test/path.html', 'imported/other/test/path.html'], self.mock_dict_two)
+            ['external/fake/test/path.html', 'external/other/test/path.html'], self.mock_dict_two)
         # The other test doesn't have an entry in the test results dict, so it is not listed as a test to rebaseline.
-        self.assertEqual(tests_to_rebaseline, ['imported/fake/test/path.html'])
+        self.assertEqual(tests_to_rebaseline, ['external/fake/test/path.html'])
 
     def test_get_test_to_rebaseline_returns_only_js_tests(self):
-        self.host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/imported/fake/test/path.html'] = (
+        self.host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/external/fake/test/path.html'] = (
             'this file does not look like a testharness JS test.')
         line_adder = W3CExpectationsLineAdder(self.host)
         tests_to_rebaseline, _ = line_adder.get_tests_to_rebaseline(
-            ['imported/fake/test/path.html'], self.mock_dict_two)
+            ['external/fake/test/path.html'], self.mock_dict_two)
         self.assertEqual(tests_to_rebaseline, [])
 
     def test_get_tests_to_rebaseline_returns_updated_dict(self):
         test_results_dict = {
-            'imported/fake/test/path.html': {
+            'external/fake/test/path.html': {
                 'one': {'expected': 'PASS', 'actual': 'TEXT', 'bug': 'crbug.com/626703'},
                 'two': {'expected': 'PASS', 'actual': 'TIMEOUT', 'bug': 'crbug.com/626703'},
             },
         }
         test_results_dict_copy = copy.deepcopy(test_results_dict)
-        self.host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/imported/fake/test/path.html'] = (
+        self.host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/external/fake/test/path.html'] = (
             '<script src="/resources/testharness.js"></script>')
         line_adder = W3CExpectationsLineAdder(self.host)
         tests_to_rebaseline, modified_test_results = line_adder.get_tests_to_rebaseline(
-            ['imported/fake/test/path.html'], test_results_dict)
-        self.assertEqual(tests_to_rebaseline, ['imported/fake/test/path.html'])
+            ['external/fake/test/path.html'], test_results_dict)
+        self.assertEqual(tests_to_rebaseline, ['external/fake/test/path.html'])
         # The record for the builder with a timeout is kept, but not with a text mismatch,
         # since that should be covered by downloading a new baseline.
         self.assertEqual(modified_test_results, {
-            'imported/fake/test/path.html': {
+            'external/fake/test/path.html': {
                 'two': {'expected': 'PASS', 'actual': 'TIMEOUT', 'bug': 'crbug.com/626703'},
             },
         })
@@ -289,22 +289,22 @@ class UpdateW3CTestExpectationsTest(LoggingTestCase):
 
     def test_get_tests_to_rebaseline_also_returns_slow_tests(self):
         test_results_dict = {
-            'imported/fake/test/path.html': {
+            'external/fake/test/path.html': {
                 'one': {'expected': 'SLOW', 'actual': 'TEXT', 'bug': 'crbug.com/626703'},
                 'two': {'expected': 'SLOW', 'actual': 'TIMEOUT', 'bug': 'crbug.com/626703'},
             },
         }
         test_results_dict_copy = copy.deepcopy(test_results_dict)
-        self.host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/imported/fake/test/path.html'] = (
+        self.host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/external/fake/test/path.html'] = (
             '<script src="/resources/testharness.js"></script>')
         line_adder = W3CExpectationsLineAdder(self.host)
         tests_to_rebaseline, modified_test_results = line_adder.get_tests_to_rebaseline(
-            ['imported/fake/test/path.html'], test_results_dict)
-        self.assertEqual(tests_to_rebaseline, ['imported/fake/test/path.html'])
+            ['external/fake/test/path.html'], test_results_dict)
+        self.assertEqual(tests_to_rebaseline, ['external/fake/test/path.html'])
         # The record for the builder with a timeout is kept, but not with a text mismatch,
         # since that should be covered by downloading a new baseline.
         self.assertEqual(modified_test_results, {
-            'imported/fake/test/path.html': {
+            'external/fake/test/path.html': {
                 'two': {'expected': 'SLOW', 'actual': 'TIMEOUT', 'bug': 'crbug.com/626703'},
             },
         })