wpt-import: Work on third_party/WebKit/LayoutTests instead of third_party/WebKit.

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

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 
 from webkitpy.common.checkout.git_mock import MockGit
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.log_testing import LoggingTestCase
 from webkitpy.w3c.test_importer import TestImporter
 
 
 MockChromiumCommit = collections.namedtuple('ChromiumCommit', ('sha', 'position'))
 
 
 class TestImporterTest(LoggingTestCase):
 
     def test_abort_on_exportable_commits(self):
         importer = TestImporter(MockHost())
         importer.exportable_but_not_exported_commits = lambda _: [
             MockChromiumCommit(sha='deadbeef', position=123)]
         importer.checkout_is_okay = lambda _: True
         return_code = importer.main(['wpt'])
         self.assertEqual(return_code, 0)
         self.assertLog([
             'INFO: Cloning repo: https://chromium.googlesource.com/external/w3c/web-platform-tests.git\n',
-            'INFO: Local path: /mock-checkout/third_party/WebKit/wpt\n',
+            'INFO: Local path: /mock-checkout/third_party/WebKit/LayoutTests/wpt\n',
             'INFO: There were exportable but not-yet-exported commits:\n',
             'INFO:   https://chromium.googlesource.com/chromium/src/+/deadbeef\n',
             'INFO: Aborting import to prevent clobbering these commits.\n',
-            'INFO: Deleting temp repo directory /mock-checkout/third_party/WebKit/wpt.\n',
+            'INFO: Deleting temp repo directory /mock-checkout/third_party/WebKit/LayoutTests/wpt.\n',
         ])
 
     def test_update_test_expectations(self):
         host = MockHost()
         host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/TestExpectations'] = (
             'Bug(test) some/test/a.html [ Failure ]\n'
             'Bug(test) some/test/b.html [ Failure ]\n'
             'Bug(test) some/test/c.html [ Failure ]\n')
         host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/VirtualTestSuites'] = '[]'
         host.filesystem.files['/mock-checkout/third_party/WebKit/LayoutTests/new/a.html'] = ''
@@ skipping 161 matching lines @@
         host.filesystem.write_text_file(dest_path + '/foo-test.html', '')
         host.filesystem.write_text_file(dest_path + '/foo-test-expected.txt', '')
         host.filesystem.write_text_file(dest_path + '/OWNERS', '')
         host.filesystem.write_text_file(dest_path + '/bar/baz/OWNERS', '')
         importer = TestImporter(host)
         importer._clear_out_dest_path(dest_path)
         self.assertFalse(host.filesystem.exists(dest_path + '/foo-test.html'))
         self.assertTrue(host.filesystem.exists(dest_path + '/foo-test-expected.txt'))
         self.assertTrue(host.filesystem.exists(dest_path + '/OWNERS'))
         self.assertTrue(host.filesystem.exists(dest_path + '/bar/baz/OWNERS'))