Modified: trunk/Tools/Scripts/webkitpy/test/finder.py (122547 => 122548)
--- trunk/Tools/Scripts/webkitpy/test/finder.py 2012-07-13 07:26:17 UTC (rev 122547)
+++ trunk/Tools/Scripts/webkitpy/test/finder.py 2012-07-13 07:39:36 UTC (rev 122548)
@@ -31,7 +31,7 @@
_log = logging.getLogger(__name__)
-class TestDirectoryTree(object):
+class _DirectoryTree(object):
def __init__(self, filesystem, top_directory, starting_subdirectory):
self.filesystem = filesystem
self.top_directory = filesystem.realpath(top_directory)
@@ -79,7 +79,7 @@
self.trees = []
def add_tree(self, top_directory, starting_subdirectory=None):
- self.trees.append(TestDirectoryTree(self.filesystem, top_directory, starting_subdirectory))
+ self.trees.append(_DirectoryTree(self.filesystem, top_directory, starting_subdirectory))
def additional_paths(self, paths):
return [tree.top_directory for tree in self.trees if tree.top_directory not in paths]
Modified: trunk/Tools/Scripts/webkitpy/test/main.py (122547 => 122548)
--- trunk/Tools/Scripts/webkitpy/test/main.py 2012-07-13 07:26:17 UTC (rev 122547)
+++ trunk/Tools/Scripts/webkitpy/test/main.py 2012-07-13 07:39:36 UTC (rev 122548)
@@ -34,7 +34,7 @@
from webkitpy.common.system.filesystem import FileSystem
from webkitpy.common.system import outputcapture
from webkitpy.test.finder import Finder
-from webkitpy.test.runner import TestRunner
+from webkitpy.test.runner import Runner
_log = logging.getLogger(__name__)
@@ -177,7 +177,7 @@
suites.append(loader.loadTestsFromName(name, None))
test_suite = unittest.TestSuite(suites)
- test_runner = TestRunner(self.stream, self._options, loader)
+ test_runner = Runner(self.stream, self._options, loader)
_log.debug("Running the tests.")
if self._options.pass_through:
Modified: trunk/Tools/Scripts/webkitpy/test/runner.py (122547 => 122548)
--- trunk/Tools/Scripts/webkitpy/test/runner.py 2012-07-13 07:26:17 UTC (rev 122547)
+++ trunk/Tools/Scripts/webkitpy/test/runner.py 2012-07-13 07:39:36 UTC (rev 122548)
@@ -31,7 +31,7 @@
_log = logging.getLogger(__name__)
-class TestRunner(object):
+class Runner(object):
def __init__(self, stream, options, loader):
self.options = options
self.stream = stream
Modified: trunk/Tools/Scripts/webkitpy/test/runner_unittest.py (122547 => 122548)
--- trunk/Tools/Scripts/webkitpy/test/runner_unittest.py 2012-07-13 07:26:17 UTC (rev 122547)
+++ trunk/Tools/Scripts/webkitpy/test/runner_unittest.py 2012-07-13 07:39:36 UTC (rev 122548)
@@ -25,7 +25,7 @@
import unittest
from webkitpy.tool.mocktool import MockOptions
-from webkitpy.test.runner import TestRunner
+from webkitpy.test.runner import Runner
class FakeModuleSuite(object):
@@ -74,7 +74,7 @@
loader = FakeLoader(('test1 (Foo)', '.', ''),
('test2 (Foo)', 'F', 'test2\nfailed'),
('test3 (Foo)', 'E', 'test3\nerred'))
- result = TestRunner(stream, options, loader).run(loader.top_suite())
+ result = Runner(stream, options, loader).run(loader.top_suite())
self.assertFalse(result.wasSuccessful())
self.assertEquals(result.testsRun, 3)
self.assertEquals(len(result.failures), 1)
@@ -87,7 +87,7 @@
loader = FakeLoader(('test1 (Foo)', '.', ''),
('test2 (Foo)', 'F', 'test2\nfailed'),
('test3 (Foo)', 'E', 'test3\nerred'))
- result = TestRunner(stream, options, loader).run(loader.top_suite())
+ result = Runner(stream, options, loader).run(loader.top_suite())
self.assertFalse(result.wasSuccessful())
self.assertEquals(result.testsRun, 3)
self.assertEquals(len(result.failures), 1)
@@ -100,7 +100,7 @@
loader = FakeLoader(('test1 (Foo)', '.', ''),
('test2 (Foo)', 'F', 'test2\nfailed'),
('test3 (Foo)', 'E', 'test3\nerred'))
- result = TestRunner(stream, options, loader).run(loader.top_suite())
+ result = Runner(stream, options, loader).run(loader.top_suite())
self.assertFalse(result.wasSuccessful())
self.assertEquals(result.testsRun, 3)
self.assertEquals(len(result.failures), 1)