Diff
Modified: trunk/Tools/ChangeLog (124376 => 124377)
--- trunk/Tools/ChangeLog 2012-08-01 22:27:51 UTC (rev 124376)
+++ trunk/Tools/ChangeLog 2012-08-01 22:52:05 UTC (rev 124377)
@@ -1,3 +1,27 @@
+2012-08-01 Dirk Pranke <[email protected]>
+
+ test-webkitpy: remove --skip-integrationtests flag
+ https://bugs.webkit.org/show_bug.cgi?id=92907
+
+ Reviewed by Ryosuke Niwa.
+
+ This flag is no longer used since the tests complete quickly.
+
+ Also clean up the unused skip_if_parallel arg in finder, and
+ make a couple of lint fixes.
+
+ * Scripts/webkitpy/test/finder.py:
+ (Finder.find_names):
+ (Finder._default_names):
+ * Scripts/webkitpy/test/finder_unittest.py:
+ (FinderTest.check_names):
+ (FinderTest.test_default_names):
+ * Scripts/webkitpy/test/main.py:
+ (Tester._parse_args):
+ (Tester.run):
+ * Scripts/webkitpy/test/main_unittest.py:
+ (TesterTest.test_no_tests_found):
+
2012-08-01 Ryosuke Niwa <[email protected]>
Generalize SheriffIRCBot to prepare for PerfBot
Modified: trunk/Tools/Scripts/webkitpy/test/finder.py (124376 => 124377)
--- trunk/Tools/Scripts/webkitpy/test/finder.py 2012-08-01 22:27:51 UTC (rev 124376)
+++ trunk/Tools/Scripts/webkitpy/test/finder.py 2012-08-01 22:52:05 UTC (rev 124377)
@@ -101,18 +101,15 @@
return tree.to_module(path)
return None
- def find_names(self, args, skip_integrationtests, find_all, skip_if_parallel=True):
- suffixes = ['_unittest.py']
- if not skip_integrationtests:
- suffixes.append('_integrationtest.py')
-
+ def find_names(self, args, find_all):
+ suffixes = ['_unittest.py', '_integrationtest.py']
if args:
names = []
for arg in args:
names.extend(self._find_names_for_arg(arg, suffixes))
return names
- return self._default_names(suffixes, find_all, skip_if_parallel)
+ return self._default_names(suffixes, find_all)
def _find_names_for_arg(self, arg, suffixes):
realpath = self.filesystem.realpath(arg)
@@ -145,7 +142,7 @@
return tree.find_modules(suffixes, path)
return []
- def _default_names(self, suffixes, find_all, skip_if_parallel):
+ def _default_names(self, suffixes, find_all):
modules = []
for tree in self.trees:
modules.extend(tree.find_modules(suffixes))
Modified: trunk/Tools/Scripts/webkitpy/test/finder_unittest.py (124376 => 124377)
--- trunk/Tools/Scripts/webkitpy/test/finder_unittest.py 2012-08-01 22:27:51 UTC (rev 124376)
+++ trunk/Tools/Scripts/webkitpy/test/finder_unittest.py 2012-08-01 22:52:05 UTC (rev 124377)
@@ -79,17 +79,15 @@
self.finder.clean_trees()
self.assertFalse(self.fs.exists('/foo2/bar2/missing.pyc'))
- def check_names(self, names, expected_names, skip_integrationtests=False, find_all=False):
- self.assertEquals(self.finder.find_names(names, skip_integrationtests, find_all),
- expected_names)
+ def check_names(self, names, expected_names, find_all=True):
+ self.assertEquals(self.finder.find_names(names, find_all), expected_names)
def test_default_names(self):
- self.check_names([], ['bar.baz_unittest', 'bar2.baz2_integrationtest'])
- self.check_names([], ['bar.baz_unittest'], skip_integrationtests=True, find_all=True)
- self.check_names([], ['bar.baz_unittest'], skip_integrationtests=True, find_all=False)
+ 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'], skip_integrationtests=True, find_all=False)
+ self.check_names(['foobar'], ['foobar'], find_all=False)
def test_paths(self):
self.fs.chdir('/foo/bar')
Modified: trunk/Tools/Scripts/webkitpy/test/main.py (124376 => 124377)
--- trunk/Tools/Scripts/webkitpy/test/main.py 2012-08-01 22:27:51 UTC (rev 124376)
+++ trunk/Tools/Scripts/webkitpy/test/main.py 2012-08-01 22:52:05 UTC (rev 124377)
@@ -85,8 +85,6 @@
help='display per-test execution time (implies --verbose)')
parser.add_option('-v', '--verbose', action='', default=0,
help='verbose output (specify once for individual test results, twice for debug messages)')
- parser.add_option('--skip-integrationtests', action='', default=False,
- help='do not run the integration tests')
parser.add_option('-p', '--pass-through', action='', default=False,
help='be debugger friendly by passing captured output through to the system')
parser.add_option('-j', '--child-processes', action='', type='int', default=(1 if sys.platform == 'win32' else multiprocessing.cpu_count()),
@@ -103,7 +101,7 @@
self.finder.clean_trees()
- names = self.finder.find_names(args, self._options.skip_integrationtests, self._options.all, self._options.child_processes != 1)
+ names = self.finder.find_names(args, self._options.all)
if not names:
_log.error('No tests to run')
return False
Modified: trunk/Tools/Scripts/webkitpy/test/main_unittest.py (124376 => 124377)
--- trunk/Tools/Scripts/webkitpy/test/main_unittest.py 2012-08-01 22:27:51 UTC (rev 124376)
+++ trunk/Tools/Scripts/webkitpy/test/main_unittest.py 2012-08-01 22:52:05 UTC (rev 124377)
@@ -41,7 +41,7 @@
root_logger.handlers = []
tester.printer.stream = errors
- tester.finder.find_names = lambda args, skip_integration, run_all, skip_if_parallel: []
+ tester.finder.find_names = lambda args, run_all: []
oc = OutputCapture()
try:
oc.capture_output()
