diff options
| author | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 18:31:01 +0000 |
|---|---|---|
| committer | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 18:31:01 +0000 |
| commit | c721537e6151a0423db125eab2946cfc285ebac2 (patch) | |
| tree | 5ba8b213ada73cf728571520cedcbc7c3044b938 /build | |
| parent | d157d5d7cd237473498cd19aa87b7b31a24e18bf (diff) | |
| download | chromium_src-c721537e6151a0423db125eab2946cfc285ebac2.zip chromium_src-c721537e6151a0423db125eab2946cfc285ebac2.tar.gz chromium_src-c721537e6151a0423db125eab2946cfc285ebac2.tar.bz2 | |
[Android] Add a check in sharder for an empty test list.
BUG=245915
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/16682003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/base/shard.py | 4 | ||||
| -rw-r--r-- | build/android/pylib/base/shard_unittest.py | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/build/android/pylib/base/shard.py b/build/android/pylib/base/shard.py index e953550..89b84f6 100644 --- a/build/android/pylib/base/shard.py +++ b/build/android/pylib/base/shard.py @@ -282,6 +282,10 @@ def ShardAndRunTests(runner_factory, devices, tests, build_type='Debug', Returns: A base_test_result.TestRunResults object. """ + if not tests: + logging.warning('No tests to run.') + return base_test_result.TestRunResults() + logging.info('Will run %d tests: %s', len(tests), str(tests)) forwarder.Forwarder.KillHost(build_type) runners = _CreateRunners(runner_factory, devices, setup_timeout) diff --git a/build/android/pylib/base/shard_unittest.py b/build/android/pylib/base/shard_unittest.py index aca44a0..25695be 100644 --- a/build/android/pylib/base/shard_unittest.py +++ b/build/android/pylib/base/shard_unittest.py @@ -83,7 +83,7 @@ class TestFunctions(unittest.TestCase): results = [] tests = shard._TestCollection([shard._Test(t) for t in tests]) shard._RunTestsFromQueue(mock_runner, tests, results, - watchdog_timer.WatchdogTimer(None)) + watchdog_timer.WatchdogTimer(None), 2) run_results = base_test_result.TestRunResults() for r in results: run_results.AddTestRunResults(r) @@ -133,7 +133,7 @@ class TestThreadGroupFunctions(unittest.TestCase): def testRun(self): runners = [MockRunner('0'), MockRunner('1')] - results = shard._RunAllTests(runners, self.tests) + results = shard._RunAllTests(runners, self.tests, 0) self.assertEqual(len(results.GetPass()), len(self.tests)) def testTearDown(self): @@ -144,13 +144,13 @@ class TestThreadGroupFunctions(unittest.TestCase): def testRetry(self): runners = shard._CreateRunners(MockRunnerFail, ['0', '1']) - results = shard._RunAllTests(runners, self.tests) + results = shard._RunAllTests(runners, self.tests, 0) self.assertEqual(len(results.GetFail()), len(self.tests)) def testReraise(self): runners = shard._CreateRunners(MockRunnerException, ['0', '1']) with self.assertRaises(TestException): - shard._RunAllTests(runners, self.tests) + shard._RunAllTests(runners, self.tests, 0) class TestShard(unittest.TestCase): @@ -168,6 +168,10 @@ class TestShard(unittest.TestCase): self.assertEqual(len(results.GetPass()), 0) self.assertEqual(len(results.GetFail()), 3) + def testNoTests(self): + results = shard.ShardAndRunTests(MockRunner, ['0', '1'], []) + self.assertEqual(len(results.GetAll()), 0) + if __name__ == '__main__': unittest.main() |