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
@@ skipping 147 matching lines @@
   # TODO(sosa):  Remove once we un-comment above.
   def testUprevPackages(self):
     """Test if we get actual revisions in revisions.pfq."""
     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()
 

[diandersAtChromium, 2010/11/03 23:53:34]

Maybe add "assert ':' not in ''.join(overlays)" here and elsewhere?

[davidjames, 2010/11/10 18:30:10]

Done. I put the asserts in the cbuildbot code so that we could catch them before
they got passed to cros_mark_as_stable.

+    overlays = [ '%s/src/third_party/chromiumos-overlay' % self._buildroot ]
     cbuildbot.RunCommand(['./cros_mark_as_stable', '--all',
                      '--board=%s' % self._test_board,
-                     '--tracking_branch="cros/master"', 'commit'],
+                     '--overlays=%s' % ':'.join(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, overlays)
     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()
 
+    overlays = [ '%s/src/third_party/chromiumos-overlay' % self._buildroot ]
     cbuildbot.RunCommand(['./cros_mark_as_stable', '--all',
                          '--board=%s' % self._test_board,
-                         '--tracking_branch="cros/master"', 'commit'],
+                         '--overlays=%s' % ':'.join(overlays),
+                         '--tracking_branch=cros/master', 'commit'],
                          cwd='%s/src/scripts' % self._buildroot,
                          enter_chroot=True)
 
     self.mox.ReplayAll()
+    overlays = [ '%s/src/third_party/chromiumos-overlay' % self._buildroot ]
     cbuildbot._UprevPackages(self._buildroot, self.tracking_branch,
-                             self._revision_file, self._test_board)
+                             self._revision_file, self._test_board, overlays)
     self.mox.VerifyAll()
 
 
 if __name__ == '__main__':
   unittest.main()