[NaCl SDK] Some fixes to update_nacl_manifest.py.

native_client_sdk/src/build_tools/tests/test_update_manifest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium 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 datetime
 import os
 import posixpath
 import subprocess
@@ skipping 20 matching lines @@
 BETA = 'beta'
 DEV = 'dev'
 CANARY = 'canary'
 
 
 def GetArchiveUrl(host_os, version):
   basename = 'naclsdk_%s.bz2' % (host_os,)
   return urlparse.urljoin(HTTPS_BASE_URL, posixpath.join(version, basename))
 
 
+def MakeGsUrl(rel_path):
+  return update_nacl_manifest.GS_BUCKET_PATH + rel_path
+
+
 def GetPathFromGsUrl(url):
   assert url.startswith(update_nacl_manifest.GS_BUCKET_PATH)
   return url[len(update_nacl_manifest.GS_BUCKET_PATH):]
 
 
 def GetPathFromHttpsUrl(url):
   assert url.startswith(HTTPS_BASE_URL)
   return url[len(HTTPS_BASE_URL):]
 
 
@@ skipping 19 matching lines @@
     for host_os in OS_MLW:
       archive = manifest_util.Archive(host_os)
       archive.url = 'http://example.com'
       archive.checksum = {'sha1': 'blah'}
       archive.size = 2
       bundle.AddArchive(archive)
   return bundle
 
 
 def MakeBundle(major_version, revision, version=None, host_oses=None):
-  assert version is None or version.split('.')[0] == major_version
-  bundle_name = 'pepper_' + major_version
+  assert version is None or version.split('.')[0] == str(major_version)
+  bundle_name = 'pepper_' + str(major_version)
   bundle = manifest_util.Bundle(bundle_name)
-  bundle.version = int(major_version)
+  bundle.version = major_version
   bundle.revision = revision
   bundle.description = 'Chrome %s bundle, revision %s' % (major_version,
       revision)
   bundle.repath = bundle_name
   bundle.recommended = 'no'
   bundle.stability = 'dev'
 
   if host_oses:
     for host_os in host_oses:
       bundle.AddArchive(MakeArchive(host_os, version))
@@ skipping 55 matching lines @@
     return self.manifest
 
   def GetHistory(self):
     return self.history
 
   def GsUtil_ls(self, url):
     path = GetPathFromGsUrl(url)
     result = []
     for filename, _ in self.files.iteritems():
       if filename.startswith(path):
-        result.append(filename)
+        result.append(MakeGsUrl(filename))
     return result
 
   def GsUtil_cat(self, url):
     path = GetPathFromGsUrl(url)
     if path not in self.files:
       raise subprocess.CalledProcessError(1, 'gsutil cat %s' % (url,))
     return self.files[path]
 
   def GsUtil_cp(self, src, dest, stdin=None):
     dest_path = GetPathFromGsUrl(dest)
     if src == '-':
       self.files[dest_path] = stdin
     else:
       src_path = GetPathFromGsUrl(src)
       if src_path not in self.files:
         raise subprocess.CalledProcessError(1, 'gsutil cp %s %s' % (src, dest))
       self.files[dest_path] = self.files[src_path]
 
   def Print(self, *args):
     # eat all informational messages
     pass
 
 
 # Shorthand for premade bundles/versions
 V18_0_1025_163 = '18.0.1025.163'
 V18_0_1025_175 = '18.0.1025.175'
 V18_0_1025_184 = '18.0.1025.184'
 V19_0_1084_41 = '19.0.1084.41'
 V19_0_1084_67 = '19.0.1084.67'
-B18_0_1025_163_R1_MLW = MakeBundle('18', '1', V18_0_1025_163, OS_MLW)
-B18_0_1025_184_R1_MLW = MakeBundle('18', '1', V18_0_1025_184, OS_MLW)
-B18_R1_NONE = MakeBundle('18', '1')
-B19_0_1084_41_R1_MLW = MakeBundle('19', '1', V19_0_1084_41, OS_MLW)
-B19_0_1084_67_R1_MLW = MakeBundle('19', '1', V19_0_1084_67, OS_MLW)
-B19_R1_NONE = MakeBundle('19', '1')
+B18_0_1025_163_R1_MLW = MakeBundle(18, 1, V18_0_1025_163, OS_MLW)
+B18_0_1025_184_R1_MLW = MakeBundle(18, 1, V18_0_1025_184, OS_MLW)
+B18_R1_NONE = MakeBundle(18, '1')
+B19_0_1084_41_R1_MLW = MakeBundle(19, 1, V19_0_1084_41, OS_MLW)
+B19_0_1084_67_R1_MLW = MakeBundle(19, 1, V19_0_1084_67, OS_MLW)
+B19_R1_NONE = MakeBundle(19, '1')
 NON_PEPPER_BUNDLE_NOARCHIVES = MakeNonPepperBundle('foo')
 NON_PEPPER_BUNDLE_ARCHIVES = MakeNonPepperBundle('bar', with_archives=True)
 
 
 class TestUpdateManifest(unittest.TestCase):
   def setUp(self):
     self.history = MakeHistory()
     self.files = MakeFiles()
     self.delegate = None
     self.uploaded_manifest = None
@@ skipping 143 matching lines @@
     self.history.Add(OS_CR, BETA, V18_0_1025_184)
     self.history.Add(OS_CR, BETA, V18_0_1025_175)
     self.history.Add(OS_MLW, BETA, V18_0_1025_163)
     self.files.Add(B18_0_1025_163_R1_MLW)
     self._MakeDelegate()
     self._Run(OS_MLW)
     self._ReadUploadedManifest()
     self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA)
     self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1)
 
+  def testSnippetWithStringRevisionAndVersion(self):
+    # This test exists because some manifest snippets were uploaded with
+    # strings for their revisions and versions. I want to make sure the
+    # resulting manifest is still consistent with the old format.
+    self.manifest = MakeManifest(B18_R1_NONE)
+    self.history.Add(OS_MLW, BETA, V18_0_1025_163)
+    bundle_string_revision = MakeBundle('18', '1234', V18_0_1025_163, OS_MLW)
+    self.files.Add(bundle_string_revision)
+    self._MakeDelegate()
+    self._Run(OS_MLW)
+    self._ReadUploadedManifest()
+    uploaded_bundle = self.uploaded_manifest.GetBundle(
+        bundle_string_revision.name)
+    self.assertEqual(uploaded_bundle.revision, 1234)
+    self.assertEqual(uploaded_bundle.version, 18)
+
 
 def main():
   suite = unittest.defaultTestLoader.loadTestsFromModule(sys.modules[__name__])
   result = unittest.TextTestRunner(verbosity=2).run(suite)
 
   return int(not result.wasSuccessful())
 
 if __name__ == '__main__':
   sys.exit(main())