Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Unified Diff: native_client_sdk/src/build_tools/tests/update_manifest_test.py

Issue 8801030: Fixed update_manifest to correctly accept format: pepper -b .. -B ..... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_win.exe ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/build_tools/tests/update_manifest_test.py
diff --git a/native_client_sdk/src/build_tools/tests/update_manifest_test.py b/native_client_sdk/src/build_tools/tests/update_manifest_test.py
index b84d345652ace8773732767378fa25b6420a1e64..1022323a8c0a570d1c1ce4b73a45bb03f4fa20a9 100755
--- a/native_client_sdk/src/build_tools/tests/update_manifest_test.py
+++ b/native_client_sdk/src/build_tools/tests/update_manifest_test.py
@@ -15,6 +15,7 @@ import sys
import tempfile
import threading
import unittest
+import urllib
import urlparse
from build_tools.sdk_tools import sdk_update
@@ -73,7 +74,7 @@ class FakeOptions(object):
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
@@ -318,16 +319,24 @@ class TestUpdateManifest(unittest.TestCase):
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():
« no previous file with comments | « native_client_sdk/src/build_tools/tests/pepper_1_0/naclsdk_win.exe ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698