Switch webkitpy to use the typ test framework (delete webkitpy.test).

Tools/Scripts/webkitpy/test/finder_unittest.py

Index: Tools/Scripts/webkitpy/test/finder_unittest.py
diff --git a/Tools/Scripts/webkitpy/test/finder_unittest.py b/Tools/Scripts/webkitpy/test/finder_unittest.py
deleted file mode 100644
index 3769565cc2a4a6d74f01f012a100bf1d8203a360..0000000000000000000000000000000000000000
--- a/Tools/Scripts/webkitpy/test/finder_unittest.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright (C) 2012 Google, Inc.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import logging
-import unittest
-
-from webkitpy.common.system.filesystem_mock import MockFileSystem
-from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.test.finder import Finder
-
-
-class FinderTest(unittest.TestCase):
-    def setUp(self):
-        files = {
-          '/foo/bar/baz.py': '',
-          '/foo/bar/baz_unittest.py': '',
-          '/foo2/bar2/baz2.py': '',
-          '/foo2/bar2/baz2.pyc': '',
-          '/foo2/bar2/baz2_integrationtest.py': '',
-          '/foo2/bar2/missing.pyc': '',
-          '/tmp/another_unittest.py': '',
-        }
-        self.fs = MockFileSystem(files)
-        self.finder = Finder(self.fs)
-        self.finder.add_tree('/foo', 'bar')
-        self.finder.add_tree('/foo2')
-
-        # Here we have to jump through a hoop to make sure test-webkitpy doesn't log
-        # any messages from these tests :(.
-        self.root_logger = logging.getLogger()
-        self.log_levels = []
-        self.log_handlers = self.root_logger.handlers[:]
-        for handler in self.log_handlers:
-            self.log_levels.append(handler.level)
-            handler.level = logging.CRITICAL
-
-    def tearDown(self):
-        for handler in self.log_handlers:
-            handler.level = self.log_levels.pop(0)
-
-    def test_additional_system_paths(self):
-        self.assertEqual(self.finder.additional_paths(['/usr']),
-                          ['/foo', '/foo2'])
-
-    def test_is_module(self):
-        self.assertTrue(self.finder.is_module('bar.baz'))
-        self.assertTrue(self.finder.is_module('bar2.baz2'))
-        self.assertTrue(self.finder.is_module('bar2.baz2_integrationtest'))
-
-        # Missing the proper namespace.
-        self.assertFalse(self.finder.is_module('baz'))
-
-    def test_to_module(self):
-        self.assertEqual(self.finder.to_module('/foo/test.py'), 'test')
-        self.assertEqual(self.finder.to_module('/foo/bar/test.py'), 'bar.test')
-        self.assertEqual(self.finder.to_module('/foo/bar/pytest.py'), 'bar.pytest')
-
-    def test_clean(self):
-        self.assertTrue(self.fs.exists('/foo2/bar2/missing.pyc'))
-        self.finder.clean_trees()
-        self.assertFalse(self.fs.exists('/foo2/bar2/missing.pyc'))
-
-    def check_names(self, names, expected_names, find_all=True):
-        self.assertEqual(self.finder.find_names(names, find_all), expected_names)
-
-    def test_default_names(self):
-        self.check_names([], ['bar.baz_unittest', 'bar2.baz2_integrationtest'], find_all=True)
-        self.check_names([], ['bar.baz_unittest', 'bar2.baz2_integrationtest'], find_all=False)
-
-        # Should return the names given it, even if they don't exist.
-        self.check_names(['foobar'], ['foobar'], find_all=False)
-
-    def test_paths(self):
-        self.fs.chdir('/foo/bar')
-        self.check_names(['baz_unittest.py'], ['bar.baz_unittest'])
-        self.check_names(['./baz_unittest.py'], ['bar.baz_unittest'])
-        self.check_names(['/foo/bar/baz_unittest.py'], ['bar.baz_unittest'])
-        self.check_names(['.'], ['bar.baz_unittest'])
-        self.check_names(['../../foo2/bar2'], ['bar2.baz2_integrationtest'])
-
-        self.fs.chdir('/')
-        self.check_names(['bar'], ['bar.baz_unittest'])
-        self.check_names(['/foo/bar/'], ['bar.baz_unittest'])
-
-        # This works 'by accident' since it maps onto a package.
-        self.check_names(['bar/'], ['bar.baz_unittest'])
-
-        # This should log an error, since it's outside the trees.
-        oc = OutputCapture()
-        oc.set_log_level(logging.ERROR)
-        oc.capture_output()
-        try:
-            self.check_names(['/tmp/another_unittest.py'], [])
-        finally:
-            _, _, logs = oc.restore_output()
-            self.assertIn('another_unittest.py', logs)
-
-        # Paths that don't exist are errors.
-        oc.capture_output()
-        try:
-            self.check_names(['/foo/bar/notexist_unittest.py'], [])
-        finally:
-            _, _, logs = oc.restore_output()
-            self.assertIn('notexist_unittest.py', logs)
-
-        # Names that don't exist are caught later, at load time.
-        self.check_names(['bar.notexist_unittest'], ['bar.notexist_unittest'])