Add more error checking to preflight queue.

bin/cbuildbot_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.
 
 """Unittests for cbuildbot.  Needs to be run inside of chroot for mox."""
 
 import __builtin__
 import mox
 import os
 import posix
 import shutil
 import unittest
 
 # Fixes circular dependency error.
 import cbuildbot_comm
 import cbuildbot
+from cros_build_lib import ReinterpretPathForChroot
 
 class CBuildBotTest(mox.MoxTestBase):
 
   def setUp(self):
     mox.MoxTestBase.setUp(self)
     # Always stub RunCommmand out as we use it in every method.
     self.mox.StubOutWithMock(cbuildbot, 'RunCommand')
     self.tracking_branch = 'cros/master'
     self._test_repos = [['kernel', 'third_party/kernel/files'],
                         ['login_manager', 'platform/login_manager']
                        ]
     self._test_cros_workon_packages = \
       'chromeos-base/kernel\nchromeos-base/chromeos-login\n'
     self._test_board = 'test-board'
     self._buildroot = '.'
     self._test_dict = {'kernel' : ['chromos-base/kernel', 'dev-util/perf'],
                        'cros' : ['chromos-base/libcros']
                       }
     self._test_string = "kernel.git@12345test cros.git@12333test"
     self._test_string += " crosutils.git@blahblah"
     self._revision_file = 'test-revisions.pfq'
     self._test_parsed_string_array = [
                                       ['chromeos-base/kernel', '12345test'],
                                       ['dev-util/perf', '12345test'],
                                       ['chromos-base/libcros', '12345test']
                                      ]
+    self._overlays = [ '%s/src/third_party/chromiumos-overlay' % self._buildroot ]

[diandersAtChromium, 2010/11/12 22:09:35]

NIT: line too long

[davidjames, 2010/11/12 22:31:25]

Done.

+    self._chroot_overlays = [ ReinterpretPathForChroot(self._overlays[0]) ]

[diandersAtChromium, 2010/11/12 22:09:35]

NIT: [ ReinterpretPathForChroot(p) for p in self._overlays ]

...then if someone adds an overlay, they don't end up with a bug.

[davidjames, 2010/11/12 22:31:25]

Done.

 
   def testParseRevisionString(self):
     """Test whether _ParseRevisionString parses string correctly."""
     return_array = cbuildbot._ParseRevisionString(self._test_string,
                                                   self._test_dict)
     self.assertEqual(len(return_array), 3)
     self.assertTrue(
       'chromeos-base/kernel', '12345test' in return_array)
     self.assertTrue(
       'dev-util/perf', '12345test' in return_array)
@@ skipping 106 matching lines @@
     self.mox.StubOutWithMock(__builtin__, 'open')
 
     # Mock out file interaction.
     m_file = self.mox.CreateMock(file)
     __builtin__.open(self._revision_file).AndReturn(m_file)
     m_file.read().AndReturn(self._test_string)
     m_file.close()
 
     cbuildbot.RunCommand(['./cros_mark_as_stable', '--all',
                      '--board=%s' % self._test_board,
-                     '--tracking_branch="cros/master"', 'commit'],
+                     '--overlays=%s' % ':'.join(self._chroot_overlays),
+                     '--tracking_branch=cros/master', 'commit'],
                      cwd='%s/src/scripts' % self._buildroot,
                      enter_chroot=True)
 
     self.mox.ReplayAll()
     cbuildbot._UprevPackages(self._buildroot, self.tracking_branch,
-                             self._revision_file, self._test_board)
+                             self._revision_file, self._test_board, self._overlays)

[diandersAtChromium, 2010/11/12 22:09:35]

NIT: > 80 characters

[davidjames, 2010/11/12 22:31:25]

Done.

     self.mox.VerifyAll()
 
   def testUprevAllPackages(self):
     """Test if we get None in revisions.pfq indicating Full Builds."""
     self.mox.StubOutWithMock(__builtin__, 'open')
 
     # Mock out file interaction.
     m_file = self.mox.CreateMock(file)
     __builtin__.open(self._revision_file).AndReturn(m_file)
     m_file.read().AndReturn('None')
     m_file.close()
 
     cbuildbot.RunCommand(['./cros_mark_as_stable', '--all',
                          '--board=%s' % self._test_board,
-                         '--tracking_branch="cros/master"', 'commit'],
+                         '--overlays=%s' % ':'.join(self._chroot_overlays),
+                         '--tracking_branch=cros/master', 'commit'],
                          cwd='%s/src/scripts' % self._buildroot,
                          enter_chroot=True)
 
     self.mox.ReplayAll()
     cbuildbot._UprevPackages(self._buildroot, self.tracking_branch,
-                             self._revision_file, self._test_board)
+                             self._revision_file, self._test_board, self._overlays)

[diandersAtChromium, 2010/11/12 22:09:35]

NIT: > 80 characters

[davidjames, 2010/11/12 22:31:25]

Done.

     self.mox.VerifyAll()
 
 
 if __name__ == '__main__':
   unittest.main()