Revert of [NaCl SDK] Remove support for bionic toolchain

native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.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 hashlib
 import logging
 import os
 import posixpath
 import subprocess
 import sys
 import tempfile
 import unittest
 import urlparse
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 BUILD_TOOLS_DIR = os.path.dirname(SCRIPT_DIR)
 
 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' \
     '/nativeclient_mirror/nacl/nacl_sdk/'
 
 OS_CR = ('cros',)
 OS_L = ('linux',)
 OS_M = ('mac',)
 OS_ML = ('mac', 'linux')
 OS_MW = ('mac', 'win')
 OS_LW = ('linux', 'win')
 OS_MLW = ('mac', 'linux', 'win')
 OS_ALL = ('all',)
 POST_STABLE = 'post_stable'
 STABLE = 'stable'
 BETA = 'beta'
 DEV = 'dev'
 CANARY = 'canary'
 
 
 def GetArchiveURL(basename, version):
   return urlparse.urljoin(HTTPS_BASE_URL, posixpath.join(version, basename))
 
 
 def GetPlatformArchiveUrl(host_os, version):
   basename = 'naclsdk_%s.tar.bz2' % (host_os,)
   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
 
 
 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):]
 
 
 def MakeArchive(url, host_os):
   archive = manifest_util.Archive(host_os)
   archive.url = url
   # dummy values that won't succeed if we ever use them, but will pass
   # validation. :)
   archive.checksum = {'sha1': 'foobar'}
   archive.size = 1
   return archive
 
 
 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):
   return MakeArchive(GetArchiveURL(basename, version), 'all')
 
 
 def MakeNonPepperBundle(name, with_archives=False):
   bundle = manifest_util.Bundle(name)
   bundle.version = 1
   bundle.revision = 1
   bundle.description = 'Dummy bundle'
   bundle.recommended = 'yes'
@@ skipping 177 matching lines @@
 B19_NONE = MakePlatformBundle(19)
 BCANARY_NONE = MakePepperBundle(0, stability=CANARY,
                                 bundle_name=CANARY_BUNDLE_NAME)
 B21_0_1145_0_MLW = MakePlatformBundle(21, 138079, V21_0_1145_0, OS_MLW)
 B21_0_1166_0_MW = MakePlatformBundle(21, 140819, V21_0_1166_0, OS_MW)
 B21_NONE = MakePlatformBundle(21)
 B26_NONE = MakePlatformBundle(26)
 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)
 
 
 class TestUpdateManifest(unittest.TestCase):
   def setUp(self):
     self.history = MakeHistory()
     self.files = MakeFiles()
     self.version_mapping = {}
     self.delegate = None
@@ skipping 391 matching lines @@
 
     uploaded_bundle = self.uploaded_manifest.GetBundle('pepper_18')
     self.assertEqual(uploaded_bundle, B18_0_1025_163_MLW)
 
   def testBundleWithoutHistoryOrOnlineRaises(self):
     self.manifest = MakeManifest(B18_NONE)
     self._MakeDelegate()
     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):
     f = tempfile.NamedTemporaryFile('w', prefix="test_update_nacl_manifest")
     self.test_file = f.name
     f.close()
     test_data = "Some test data"
     self.sha1 = hashlib.sha1(test_data).hexdigest()
     self.data_len = len(test_data)
     with open(self.test_file, 'w') as f:
@@ skipping 21 matching lines @@
     self.assertRaises(manifest_util.Error, manifest.Validate)
 
     manifest.Validate(add_missing_info=True)
 
     self.assertEqual(archive['size'], self.data_len)
     self.assertEqual(archive['checksum']['sha1'], self.sha1)
 
 
 if __name__ == '__main__':
   unittest.main()