Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1845)

Unified Diff: Tools/Scripts/webkitpy/test/main_unittest.py

Issue 454223003: Remove the concept of 'integration tests' from test-webkitpy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: merge forward, remove dead / uneeded code Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Tools/Scripts/webkitpy/test/main.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/webkitpy/test/main_unittest.py
diff --git a/Tools/Scripts/webkitpy/test/main_unittest.py b/Tools/Scripts/webkitpy/test/main_unittest.py
index 8113f6931026b814a65814478749336a1d81a41d..4589792604b3d03f904efbd3101e5b8d326da271 100644
--- a/Tools/Scripts/webkitpy/test/main_unittest.py
+++ b/Tools/Scripts/webkitpy/test/main_unittest.py
@@ -28,7 +28,7 @@ import StringIO
from webkitpy.common.system.filesystem import FileSystem
from webkitpy.common.system.executive import Executive
from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.test.main import Tester, _Loader
+from webkitpy.test.main import Tester
STUBS_CLASS = __name__ + ".TestStubs"
@@ -38,9 +38,6 @@ class TestStubs(unittest.TestCase):
def test_empty(self):
pass
- def integration_test_empty(self):
- pass
-
class TesterTest(unittest.TestCase):
@@ -73,24 +70,13 @@ class TesterTest(unittest.TestCase):
def _find_test_names(self, args):
tester = Tester()
tester._options, args = tester._parse_args(args)
- return tester._test_names(_Loader(), args)
+ return tester._test_names(unittest.TestLoader(), args)
def test_individual_names_are_not_run_twice(self):
args = [STUBS_CLASS + '.test_empty']
tests = self._find_test_names(args)
self.assertEqual(tests, args)
- def test_integration_tests_are_not_found_by_default(self):
- tests = self._find_test_names([STUBS_CLASS])
- self.assertEqual(tests, [STUBS_CLASS + '.test_empty'])
-
- def test_integration_tests_are_found(self):
- tests = self._find_test_names(['--integration-tests', STUBS_CLASS])
- self.assertEqual(tests, [
- STUBS_CLASS + '.integration_test_empty',
- STUBS_CLASS + '.test_empty',
- ])
-
def test_coverage_works(self):
# This is awkward; by design, running test-webkitpy -c will
# create a .coverage file in Tools/Scripts, so we need to be
« no previous file with comments | « Tools/Scripts/webkitpy/test/main.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698