Revert "Plumb in crprocess instead of RunCommand to allow quiet operation."

shell/main_unittest.py

 #!/usr/bin/python
 #
 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for main.py."""
 
 import doctest
 import os
@@ skipping 33 matching lines @@
 class TestFindCommand(unittest.TestCase):
   """Test main._FindCommand."""
   # TODO(dianders): Add a test where I override main._COMMAND_HANDLERS
   # and main._COMMAND_STRS so that I can test more of _FindCommand().
 
   def setUp(self):
     """Test initialization."""
     # Create our mox and stub out function calls used by _FindCommand()...
     self.mox = mox.Mox()
     self.mox.StubOutWithMock(cros_lib, 'Die')
+    self.mox.StubOutWithMock(cros_lib, 'Info')
     self.mox.StubOutWithMock(text_menu, 'TextMenu')
 
   def tearDown(self):
     """Test cleanup."""
     # Unset stubs...
     self.mox.UnsetStubs()
 
   def testInvalidCommand(self):
     """Test that _FindCommand('implode') causes cros_lib.Die()."""
     # Should be a call to cros_lib.Die.  We'll have it fake a _DeathException...
@@ skipping 77 matching lines @@
   def testShCommand(self):
     """Test that _FindCommand('sh') returns 'shell'.
 
     This serves two purposes:
     1. Test the 'prefix' feature of _FindCommand
     2. Validate that nobody has introduced another command that starts with
        'sh', since it's expected that many people will use this to invoke the
        shell.
     """
     # _FindCommand should give us a message that it has interpreted sh as shell.
+    cros_lib.Info(mox.IsA(basestring))
 
     # Run the command and verify proper mocks were called...
     self.mox.ReplayAll()
     cmd_str = main._FindCommand('sh')
     self.mox.VerifyAll()
 
     self.assertEqual(cmd_str, 'shell',
                      '_FindCommand("sh") should return "shell" back.')
 
 
 class TestFindSpec(unittest.TestCase):
   """Test utils.FindSpec."""
 
   def setUp(self):
     """Test initialization."""
     # Create our mox and stub out function calls used by _FindSpec()...
     self.mox = mox.Mox()
     self.mox.StubOutWithMock(os, 'listdir')
     self.mox.StubOutWithMock(os.path, 'isfile')
     self.mox.StubOutWithMock(cros_lib, 'Die')
+    self.mox.StubOutWithMock(cros_lib, 'Info')
     self.mox.StubOutWithMock(text_menu, 'TextMenu')
 
   def tearDown(self):
     """Test cleanup."""
     # Unset stubs...
     self.mox.UnsetStubs()
 
   def testInvalidSpec(self):
     """Test that _FindSpec('bogusSpec') causes cros_lib.Die()."""
     # Pass this spec name...
@@ skipping 215 matching lines @@
     self.mox.VerifyAll()
 
     self.assertTrue(re.search('^/.*%s$' % expected_result, spec_path),
                     '_FindSpec("%s") incorrectly returned "%s".' %
                     (spec_name, spec_path))
 
 
 if __name__ == '__main__':
   doctest.testmod(main)
   unittest.main()