Always pass board to cros_mark_as_stable.

cros_mark_as_stable_unittest.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 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 cros_mark_as_stable.py."""
 
 
 import mox
@@ skipping 151 matching lines @@
     cros_mark_as_stable.shutil.copyfile(ebuild_9999, self.revved_ebuild_path)
     cros_mark_as_stable.fileinput.input(self.revved_ebuild_path,
                                         inplace=1).AndReturn(mock_file)
     m_file.write('EAPI=2')
     m_file.write('CROS_WORKON_COMMIT="my_id"\n')
     m_file.write('KEYWORDS="x86 arm"')
     m_file.write('src_unpack(){}')
     diff_cmd = ['diff', '-Bu', self.m_ebuild.ebuild_path,
                 self.revved_ebuild_path]
     cros_mark_as_stable.RunCommand(diff_cmd, exit_code=True,
-                                   print_cmd=False).AndReturn(1)
+                                   print_cmd=False, redirect_stderr=True,
+                                   redirect_stdout=True).AndReturn(1)
     cros_mark_as_stable._SimpleRunCommand('git add ' + self.revved_ebuild_path)
     cros_mark_as_stable._SimpleRunCommand('git rm ' + self.m_ebuild.ebuild_path)
 
     self.mox.ReplayAll()
     marker = cros_mark_as_stable.EBuildStableMarker(self.m_ebuild)
     marker.RevEBuild('my_id', redirect_file=m_file)
     self.mox.VerifyAll()
 
   def testRevUnchangedEBuild(self):
     self.mox.StubOutWithMock(cros_mark_as_stable.fileinput, 'input')
@@ skipping 11 matching lines @@
     cros_mark_as_stable.shutil.copyfile(ebuild_9999, self.revved_ebuild_path)
     cros_mark_as_stable.fileinput.input(self.revved_ebuild_path,
                                         inplace=1).AndReturn(mock_file)
     m_file.write('EAPI=2')
     m_file.write('CROS_WORKON_COMMIT="my_id"\n')
     m_file.write('KEYWORDS="x86 arm"')
     m_file.write('src_unpack(){}')
     diff_cmd = ['diff', '-Bu', self.m_ebuild.ebuild_path,
                 self.revved_ebuild_path]
     cros_mark_as_stable.RunCommand(diff_cmd, exit_code=True,
-                                   print_cmd=False).AndReturn(0)
+                                   print_cmd=False, redirect_stderr=True,
+                                   redirect_stdout=True).AndReturn(0)
     cros_mark_as_stable.os.unlink(self.revved_ebuild_path)
 
     self.mox.ReplayAll()
     marker = cros_mark_as_stable.EBuildStableMarker(self.m_ebuild)
     marker.RevEBuild('my_id', redirect_file=m_file)
     self.mox.VerifyAll()
 
   def testRevMissingEBuild(self):
     self.mox.StubOutWithMock(cros_mark_as_stable.fileinput, 'input')
     self.mox.StubOutWithMock(cros_mark_as_stable.os.path, 'exists')
@@ skipping 12 matching lines @@
     cros_mark_as_stable.shutil.copyfile(ebuild_9999, self.revved_ebuild_path)
     cros_mark_as_stable.fileinput.input(self.revved_ebuild_path,
                                         inplace=1).AndReturn(mock_file)
     m_file.write('EAPI=2')
     m_file.write('CROS_WORKON_COMMIT="my_id"\n')
     m_file.write('KEYWORDS="x86 arm"')
     m_file.write('src_unpack(){}')
     diff_cmd = ['diff', '-Bu', self.m_ebuild.ebuild_path,
                 self.revved_ebuild_path]
     cros_mark_as_stable.RunCommand(diff_cmd, exit_code=True,
-                                   print_cmd=False).AndReturn(1)
+                                   print_cmd=False, redirect_stderr=True,
+                                   redirect_stdout=True).AndReturn(1)
     cros_mark_as_stable._SimpleRunCommand('git add ' + self.revved_ebuild_path)
     cros_mark_as_stable._SimpleRunCommand('git rm ' + self.m_ebuild.ebuild_path)
 
     self.mox.ReplayAll()
     marker = cros_mark_as_stable.EBuildStableMarker(self.m_ebuild)
     marker.RevEBuild('my_id', redirect_file=m_file)
     self.mox.VerifyAll()
 
 
   def testCommitChange(self):
@@ skipping 49 matching lines @@
     cros_mark_as_stable._FindStableEBuilds([]).AndReturn(package)
     self.mox.ReplayAll()
     cros_mark_as_stable._BuildEBuildDictionary(overlays, False, [])
     self.assertEquals(len(overlays), 1)
     self.assertEquals(overlays["/overlay"], [])
     self.mox.VerifyAll()
 
 
 if __name__ == '__main__':
   unittest.main()