Switch from gsdview.appspot.com to commondatastorage.googleapis.com.

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 prebuilt
 import shutil
 import tempfile
 import unittest
+import urllib
 from chromite.lib import cros_build_lib
 from chromite.lib.binpkg import PackageIndex
 
-PUBLIC_PACKAGES = [{'CPV': 'public1', 'SHA1': '1'},
-                   {'CPV': 'public2', 'SHA1': '2', 'PATH': 'foo.tgz'}]
+PUBLIC_PACKAGES = [{'CPV': 'gtk+/public1', 'SHA1': '1'},
+                   {'CPV': 'gtk+/public2', 'SHA1': '2',
+                    'PATH': 'gtk%2B/foo.tgz'}]
 PRIVATE_PACKAGES = [{'CPV': 'private', 'SHA1': '3'}]
 
 
 def SimplePackageIndex(header=True, packages=True):
    pkgindex = PackageIndex()
    if header:
      pkgindex.header['URI'] = 'http://www.example.com'
    if packages:
      pkgindex.packages = copy.deepcopy(PUBLIC_PACKAGES + PRIVATE_PACKAGES)
    return pkgindex
@@ skipping 182 matching lines @@
     pkgindex = SimplePackageIndex(packages=False)
     db = {}
     pkgindex._PopulateDuplicateDB(db)
     self.assertEqual(db, {})
 
   def testNormalIndex(self):
     pkgindex = SimplePackageIndex()
     db = {}
     pkgindex._PopulateDuplicateDB(db)
     self.assertEqual(len(db), 3)
-    self.assertEqual(db['1'], 'http://www.example.com/public1.tbz2')
-    self.assertEqual(db['2'], 'http://www.example.com/foo.tgz')
+    self.assertEqual(db['1'], 'http://www.example.com/gtk%2B/public1.tbz2')
+    self.assertEqual(db['2'], 'http://www.example.com/gtk%2B/foo.tgz')
     self.assertEqual(db['3'], 'http://www.example.com/private.tbz2')
 
   def testMissingSHA1(self):
     db = {}
     pkgindex = SimplePackageIndex()
     del pkgindex.packages[0]['SHA1']
     pkgindex._PopulateDuplicateDB(db)
     self.assertEqual(len(db), 2)
-    self.assertEqual(db['2'], 'http://www.example.com/foo.tgz')
+    self.assertEqual(db['2'], 'http://www.example.com/gtk%2B/foo.tgz')
     self.assertEqual(db['3'], 'http://www.example.com/private.tbz2')
 
   def testFailedPopulate(self):
     db = {}
     pkgindex = SimplePackageIndex(header=False)
     self.assertRaises(KeyError, pkgindex._PopulateDuplicateDB, db)
     pkgindex = SimplePackageIndex()
     del pkgindex.packages[0]['CPV']
     self.assertRaises(KeyError, pkgindex._PopulateDuplicateDB, db)
 
@@ skipping 15 matching lines @@
     uploads = pkgindex.ResolveDuplicateUploads([empty])
     self.assertEqual(uploads, pristine.packages)
     self.assertEqual(pkgindex.packages, pristine.packages)
     self.assertEqual(pkgindex.modified, False)
 
   def testDuplicates(self):
     pkgindex = SimplePackageIndex()
     dup_pkgindex = SimplePackageIndex()
     expected_pkgindex = SimplePackageIndex()
     for pkg in expected_pkgindex.packages:
-      pkg.setdefault('PATH', pkg['CPV'] + '.tbz2')
+      pkg.setdefault('PATH', urllib.quote(pkg['CPV'] + '.tbz2'))
     uploads = pkgindex.ResolveDuplicateUploads([dup_pkgindex])
     self.assertEqual(pkgindex.packages, expected_pkgindex.packages)
 
   def testMissingSHA1(self):
     db = {}
     pkgindex = SimplePackageIndex()
     dup_pkgindex = SimplePackageIndex()
     expected_pkgindex = SimplePackageIndex()
     del pkgindex.packages[0]['SHA1']
     del expected_pkgindex.packages[0]['SHA1']
@@ skipping 16 matching lines @@
     pkgindex = SimplePackageIndex()
     self.mox.StubOutWithMock(pkgindex, 'Write')
     pkgindex.Write(mox.IgnoreArg())
     self.mox.ReplayAll()
     f = pkgindex.WriteToNamedTemporaryFile()
     self.assertEqual(f.read(), '')
 
 
 if __name__ == '__main__':
   unittest.main()