Fixed update_manifest to correctly accept format: pepper -b .. -B .....

native_client_sdk/src/build_tools/tests/update_manifest_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for update_manifest.py."""
 
 __author__ = 'mball@google.com (Matt Ball)'
 
 import errno
 import os
 import SimpleHTTPServer
 import SocketServer
 import sys
 import tempfile
 import threading
 import unittest
+import urllib
 import urlparse
 
 from build_tools.sdk_tools import sdk_update
 from build_tools.sdk_tools import update_manifest
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 def RemoveFile(filename):
   '''Remove a filename if it exists and do nothing if it doesn't exist'''
@@ skipping 38 matching lines @@
     self.bundle_version = None
     self.bundle_revision = None
     self.desc = None
     self.gsutil = os.path.join(TEST_DIR, 'fake_gsutil.bat'
                                if sys.platform == 'win32' else 'fake_gsutil.py')
     self.linux_arch_url = None
     self.mac_arch_url = None
     self.manifest_file = os.path.join(TEST_DIR, 'naclsdk_manifest_test.json')
     self.manifest_version = None
     self.recommended = None
-    self.root_url = 'http://localhost/test_url'
+    self.root_url = 'file://%s' % urllib.pathname2url(TEST_DIR)
     self.stability = None
     self.upload = False
     self.win_arch_url = None
 
 
 class TestUpdateManifest(unittest.TestCase):
   ''' Test basic functionality of the update_manifest package.
 
   Note that update_manifest.py now imports sdk_update.py, so this file
   tests the update_manifest features within sdk_update.'''
@@ skipping 224 matching lines @@
     update_manifest.UpdateSDKManifestFile(options).HandleBundles()
 
   def testHandlePepper(self):
     '''Test the handling of pepper bundles'''
     options = FakeOptions()
     options.bundle_name = 'pepper'
     options.bundle_version = None
     self.assertRaises(
         update_manifest.Error,
         update_manifest.UpdateSDKManifestFile(options).HandleBundles)
+    options.bundle_name = 'pepper'
     options.bundle_version = 1
     options.bundle_revision = None
     self.assertRaises(
         update_manifest.Error,
         update_manifest.UpdateSDKManifestFile(options).HandleBundles)
+    options.bundle_name = 'pepper'
     options.bundle_revision = 0
-    update_manifest.UpdateSDKManifestFile(options).HandleBundles()
+    manifest_object = update_manifest.UpdateSDKManifestFile(options)
+    manifest_object.HandleBundles()
+    manifest_object.UpdateWithOptions()
+
+    options = FakeOptions()
     options.bundle_name = 'pepper_1'
-    options.bundle_version = None
-    update_manifest.UpdateSDKManifestFile(options).HandleBundles()
+    options.bundle_revision = 0
+    manifest_object = update_manifest.UpdateSDKManifestFile(options)
+    manifest_object.HandleBundles()
+    manifest_object.UpdateWithOptions()
 
 
 def main():
   suite = unittest.TestLoader().loadTestsFromTestCase(TestUpdateManifest)
   result = unittest.TextTestRunner(verbosity=2).run(suite)
 
   return int(not result.wasSuccessful())
 
 
 if __name__ == '__main__':
   sys.exit(main())