Update prebuilt.py to support uploading a board tarball to Google Storage.

buildbot/prebuilt_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.
 
 import copy
 import mox
 import os
+import multiprocessing
 import shutil
 import sys
 import tempfile
 import unittest
 import urllib
 
 import constants
 sys.path.append(constants.SOURCE_ROOT)
 import prebuilt
 from chromite.lib import cros_build_lib
@@ skipping 428 matching lines @@
 
   def tearDown(self):
     self.mox.UnsetStubs()
     self.mox.VerifyAll()
 
   def testSyncHostPrebuilts(self):
     package_path = os.path.join(self.build_path,
                                 prebuilt._HOST_PACKAGES_PATH)
     url_suffix = prebuilt._REL_HOST_PATH % {'version': self.version,
         'target': prebuilt._HOST_TARGET }
-    self.uploader._UploadPrebuilt(package_path, url_suffix)
+    packages_url_suffix = '%s/packages' % url_suffix.rstrip('/')
+    self.uploader._UploadPrebuilt(package_path, packages_url_suffix)
     url_value = '%s/%s/' % (self.binhost.rstrip('/'), url_suffix.rstrip('/'))
     prebuilt.RevGitFile(mox.IgnoreArg(), url_value, key=self.key)
     prebuilt.UpdateBinhostConfFile(mox.IgnoreArg(), self.key, url_value)
     self.mox.ReplayAll()
     self.uploader._SyncHostPrebuilts(self.build_path, self.version, self.key,
         True, True)
 
   def testSyncBoardPrebuilts(self):
     board = 'x86-generic'
     board_path = os.path.join(self.build_path,
         prebuilt._BOARD_PATH % {'board': board})
     package_path = os.path.join(board_path, 'packages')
     url_suffix = prebuilt._REL_BOARD_PATH % {'version': self.version,
         'board': board }
-    self.uploader._UploadPrebuilt(package_path, url_suffix)
+    packages_url_suffix = '%s/packages' % url_suffix.rstrip('/')
+    process = None
+    self.mox.StubOutWithMock(multiprocessing.Process, '__init__')
+    self.mox.StubOutWithMock(multiprocessing.Process, 'start')
+    self.mox.StubOutWithMock(multiprocessing.Process, 'join')
+    multiprocessing.Process.__init__(target=self.uploader._UploadBoardTarball,
+      args=(board_path, url_suffix))
+    multiprocessing.Process.start()
+    self.uploader._UploadPrebuilt(package_path, packages_url_suffix)
+    multiprocessing.Process.join()
     url_value = '%s/%s/' % (self.binhost.rstrip('/'), url_suffix.rstrip('/'))
     prebuilt.DeterminePrebuiltConfFile(self.build_path, board).AndReturn('foo')
     prebuilt.RevGitFile('foo', url_value, key=self.key)
     prebuilt.UpdateBinhostConfFile(mox.IgnoreArg(), self.key, url_value)
     self.mox.ReplayAll()
     self.uploader._SyncBoardPrebuilts(board, self.build_path, self.version,
-        self.key, True, True)
+        self.key, True, True, True)
 
 
 class TestMain(unittest.TestCase):
 
   def setUp(self):
     self.mox = mox.Mox()
 
   def tearDown(self):
     self.mox.UnsetStubs()
     self.mox.VerifyAll()
 
   def testMain(self):
     """Test that the main function works."""
     options = mox.MockObject(object)
     old_binhost = 'http://prebuilt/1'
     options.previous_binhost_url = [old_binhost]
     options.board = 'x86-generic'
     options.build_path = '/trunk'
     options.private = True
     options.sync_host = True
     options.git_sync = True
+    options.upload_board_tarball = True
     options.upload = 'gs://upload/'
     options.binhost_base_url = options.upload
     options.prepend_version = True
     options.filters = True
     options.key = 'PORTAGE_BINHOST'
     options.sync_binhost_conf = True
     self.mox.StubOutWithMock(prebuilt, 'ParseOptions')
     prebuilt.ParseOptions().AndReturn(options)
     self.mox.StubOutWithMock(prebuilt, 'LoadPrivateFilters')
     prebuilt.LoadPrivateFilters(options.build_path)
     self.mox.StubOutWithMock(prebuilt, 'GrabRemotePackageIndex')
     prebuilt.GrabRemotePackageIndex(old_binhost).AndReturn(True)
     self.mox.StubOutWithMock(prebuilt.PrebuiltUploader, '__init__')
     self.mox.StubOutWithMock(prebuilt, 'GetBoardPathFromCrosOverlayList')
     fake_overlay_path = '/fake_path'
     acl_path = prebuilt.GetBoardPathFromCrosOverlayList(
         options.build_path, options.board).AndReturn(fake_overlay_path)
     expected_gs_acl_path = os.path.join(fake_overlay_path,
                                         prebuilt._GOOGLESTORAGE_ACL_FILE)
     prebuilt.PrebuiltUploader.__init__(options.upload, expected_gs_acl_path,
                                        options.upload, mox.IgnoreArg())
     self.mox.StubOutWithMock(prebuilt.PrebuiltUploader, '_SyncHostPrebuilts')
     prebuilt.PrebuiltUploader._SyncHostPrebuilts(options.build_path,
         mox.IgnoreArg(), options.key, options.git_sync,
         options.sync_binhost_conf)
     self.mox.StubOutWithMock(prebuilt.PrebuiltUploader, '_SyncBoardPrebuilts')
     prebuilt.PrebuiltUploader._SyncBoardPrebuilts(options.board,
         options.build_path, mox.IgnoreArg(), options.key, options.git_sync,
-        options.sync_binhost_conf)
+        options.sync_binhost_conf, options.upload_board_tarball)
     self.mox.ReplayAll()
     prebuilt.main()
 
 if __name__ == '__main__':
   unittest.main()