Update cbuildbot.py and prebuilt.py to deduplicate preflight prebuilts.

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 210 matching lines @@
                          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'))
+    binhost = 'http://www.example.com'
+    binhosts = [binhost, None]
+    check = mox.And(mox.IsA(list), mox.In(binhost), mox.Not(mox.In(None)),
+                    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')
+    cbuildbot._UploadPrebuilts(self._buildroot, self._test_board, 'public',
+                               binhosts)
     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/'))
+    binhost = 'http://www.example.com'
+    binhosts = [binhost, None]
+    check = mox.And(mox.IsA(list), mox.In(binhost), mox.Not(mox.In(None)),
+                    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')
+    cbuildbot._UploadPrebuilts(self._buildroot, self._test_board, 'private',
+                               binhosts)
     self.mox.VerifyAll()
 
 
 if __name__ == '__main__':
   unittest.main()