Updates the test runner script exit codes

build/android/pylib/base/shard_unittest.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unittests for shard.py."""
 
 import os
 import sys
 import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)),
                 os.pardir, os.pardir))
 
 # Mock out android_commands.GetAttachedDevices().
 from pylib import android_commands
 android_commands.GetAttachedDevices = lambda: ['0', '1']
+from pylib import constants
 from pylib.utils import watchdog_timer
 
 import base_test_result
 import shard
 
 
 class TestException(Exception):
   pass
 
 
@@ skipping 99 matching lines @@
     runners = shard._CreateRunners(MockRunner, ['0', '1'])
     for runner in runners:
       self.assertEqual(runner.setups, 1)
     self.assertEqual(set([r.device for r in runners]),
                      set(['0', '1']))
     self.assertEqual(set([r.shard_index for r in runners]),
                      set([0, 1]))
 
   def testRun(self):
     runners = [MockRunner('0'), MockRunner('1')]
-    results = shard._RunAllTests(runners, self.tests, 0)
+    results, exit_code = shard._RunAllTests(runners, self.tests, 0)
     self.assertEqual(len(results.GetPass()), len(self.tests))
+    self.assertEqual(exit_code, constants.NORMAL_EXIT_CODE)
 
   def testTearDown(self):
     runners = [MockRunner('0'), MockRunner('1')]
     shard._TearDownRunners(runners)
     for runner in runners:
       self.assertEqual(runner.teardowns, 1)
 
   def testRetry(self):
     runners = shard._CreateRunners(MockRunnerFail, ['0', '1'])
-    results = shard._RunAllTests(runners, self.tests, 0)
+    results, exit_code = shard._RunAllTests(runners, self.tests, 0)
     self.assertEqual(len(results.GetFail()), len(self.tests))
+    self.assertEqual(exit_code, constants.ERROR_EXIT_CODE)
 
   def testReraise(self):
     runners = shard._CreateRunners(MockRunnerException, ['0', '1'])
     with self.assertRaises(TestException):
       shard._RunAllTests(runners, self.tests, 0)
 
 
 class TestShard(unittest.TestCase):
   """Tests for shard.Shard."""
   @staticmethod
   def _RunShard(runner_factory):
     return shard.ShardAndRunTests(runner_factory, ['0', '1'], ['a', 'b', 'c'])
 
   def testShard(self):
-    results = TestShard._RunShard(MockRunner)
+    results, exit_code = TestShard._RunShard(MockRunner)
     self.assertEqual(len(results.GetPass()), 3)
+    self.assertEqual(exit_code, constants.NORMAL_EXIT_CODE)
 
   def testFailing(self):
-    results = TestShard._RunShard(MockRunnerFail)
+    results, exit_code = TestShard._RunShard(MockRunnerFail)
     self.assertEqual(len(results.GetPass()), 0)
     self.assertEqual(len(results.GetFail()), 3)
+    self.assertEqual(exit_code, constants.ERROR_EXIT_CODE)
 
   def testNoTests(self):
-    results = shard.ShardAndRunTests(MockRunner, ['0', '1'], [])
+    results, exit_code = shard.ShardAndRunTests(MockRunner, ['0', '1'], [])
     self.assertEqual(len(results.GetAll()), 0)
+    self.assertEqual(exit_code, constants.NORMAL_EXIT_CODE)
 
 
 if __name__ == '__main__':
   unittest.main()