Update cbuildbot.py to upload prebuilts from preflight buildbot.

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 133 matching lines @@
   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()
 
+    drop_file = cbuildbot._PACKAGE_FILE % {'buildroot': self._buildroot}
     cbuildbot.RunCommand(['./cros_mark_as_stable', '--all',
                      '--board=%s' % self._test_board,
                      '--overlays=%s' % ':'.join(self._chroot_overlays),
-                     '--tracking_branch=cros/master', 'commit'],
+                     '--tracking_branch=cros/master',
+                     '--drop_file=%s' % ReinterpretPathForChroot(drop_file),
+                     '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._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()
 
+    drop_file = cbuildbot._PACKAGE_FILE % {'buildroot': self._buildroot}
     cbuildbot.RunCommand(['./cros_mark_as_stable', '--all',
                          '--board=%s' % self._test_board,
                          '--overlays=%s' % ':'.join(self._chroot_overlays),
-                         '--tracking_branch=cros/master', 'commit'],
+                         '--tracking_branch=cros/master',
+                         '--drop_file=%s' % ReinterpretPathForChroot(drop_file),
+                         '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._overlays)
     self.mox.VerifyAll()
 
+  def testGetPortageEnvVar(self):
+    """Basic test case for _GetPortageEnvVar function."""
+    envvar = 'EXAMPLE'
+    cbuildbot.RunCommand(mox.And(mox.IsA(list), mox.In(envvar)),
+                         cwd='%s/src/scripts' % self._buildroot,
+                         redirect_stdout=True, enter_chroot=True,
+                         error_ok=True).AndReturn('RESULT\n')
+    self.mox.ReplayAll()
+    result = cbuildbot._GetPortageEnvVar(self._buildroot, self._test_board,
+                                         envvar)
+    self.mox.VerifyAll()
+    self.assertEqual(result, 'RESULT')
+
+  def testUploadPublicPrebuilts(self):
+    """Test _UploadPrebuilts with a public location."""
+    check = mox.And(mox.IsA(list), mox.In('gs://chromeos-prebuilt'))
+    cbuildbot.RunCommand(check, cwd='%s/src/scripts' % self._buildroot)
+    self.mox.ReplayAll()
+    cbuildbot._UploadPrebuilts(self._buildroot, self._test_board, 'public')
+    self.mox.VerifyAll()
+
+  def testUploadPrivatePrebuilts(self):
+    """Test _UploadPrebuilts with a private location."""
+    check = mox.And(mox.IsA(list), mox.In('chromeos-images:/var/www/prebuilt/'))
+    cbuildbot.RunCommand(check, cwd='%s/src/scripts' % self._buildroot)
+    self.mox.ReplayAll()
+    cbuildbot._UploadPrebuilts(self._buildroot, self._test_board, 'private')
+    self.mox.VerifyAll()
+
 
 if __name__ == '__main__':
   unittest.main()