Index: native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py |
diff --git a/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py b/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py |
index d23e43ea351e7f9d39024b8511ad737676be115b..adfeddbb90f1efe0aebc505118599fccef3c10c7 100755 |
--- a/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py |
+++ b/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py |
@@ -21,7 +21,7 @@ |
sys.path.append(BUILD_TOOLS_DIR) |
import manifest_util |
import update_nacl_manifest |
-from update_nacl_manifest import CANARY_BUNDLE_NAME |
+from update_nacl_manifest import CANARY_BUNDLE_NAME, BIONIC_CANARY_BUNDLE_NAME |
HTTPS_BASE_URL = 'https://storage.googleapis.com' \ |
@@ -51,6 +51,11 @@ |
return GetArchiveURL(basename, version) |
+def GetBionicArchiveUrl(version): |
+ basename = 'naclsdk_bionic.tar.bz2' |
+ return GetArchiveURL(basename, version) |
+ |
+ |
def MakeGsUrl(rel_path): |
return update_nacl_manifest.GS_BUCKET_PATH + rel_path |
@@ -77,6 +82,10 @@ |
def MakePlatformArchive(host_os, version): |
return MakeArchive(GetPlatformArchiveUrl(host_os, version), host_os) |
+ |
+ |
+def MakeBionicArchive(host_os, version): |
+ return MakeArchive(GetBionicArchiveUrl(version), host_os) |
def MakeNonPlatformArchive(basename, version): |
@@ -276,6 +285,9 @@ |
B26_0_1386_0_MLW = MakePlatformBundle(26, 177362, V26_0_1386_0, OS_MLW) |
B26_0_1386_1_MLW = MakePlatformBundle(26, 177439, V26_0_1386_1, OS_MLW) |
BTRUNK_140819_MLW = MakePlatformBundle(21, 140819, VTRUNK_140819, OS_MLW) |
+BBIONIC_NONE = MakePepperBundle(0, stability=CANARY, |
+ bundle_name=BIONIC_CANARY_BUNDLE_NAME) |
+BBIONIC_TRUNK_277776 = MakeBionicBundle(37, 277776, VTRUNK_277776, OS_L) |
NON_PEPPER_BUNDLE_NOARCHIVES = MakeNonPepperBundle('foo') |
NON_PEPPER_BUNDLE_ARCHIVES = MakeNonPepperBundle('bar', with_archives=True) |
@@ -687,6 +699,18 @@ |
self.assertRaises(update_nacl_manifest.UnknownLockedBundleException, |
self._Run, OS_MLW) |
+ def testUpdateBionic(self): |
+ bionic_bundle = copy.deepcopy(BBIONIC_NONE) |
+ self.manifest = MakeManifest(bionic_bundle) |
+ self.history.Add(OS_MW, CANARY, V37_0_2054_0) |
+ self.files.Add(BBIONIC_TRUNK_277776) |
+ self.version_mapping[V37_0_2054_0] = VTRUNK_277776 |
+ self._MakeDelegate() |
+ self._Run(OS_MLW) |
+ self._ReadUploadedManifest() |
+ self._AssertUploadedManifestHasBundle(BBIONIC_TRUNK_277776, CANARY, |
+ bundle_name=BIONIC_CANARY_BUNDLE_NAME) |
+ |
class TestUpdateVitals(unittest.TestCase): |
def setUp(self): |