Fixed failing sdk_update_test on NaCl SDK bots

native_client_sdk/src/build_tools/tests/sdk_update_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 sdk_update.py."""
 
 import exceptions
 import mox
 import os
@@ skipping 66 matching lines @@
                   os.path.join(SCRIPT_DIR, 'sdk_test_cache'),
                '--manifest-url=file://%s' %
                    urllib.pathname2url(os.path.join(
                        SCRIPT_DIR, 'naclsdk_manifest_test.json')),
                'list']
     bundle_list = CallSDKUpdate(command)[0]
     # Just do some simple sanity checks on the resulting string
     self.assertEqual(bundle_list.count('sdk_tools'), 2)
     self.assertEqual(bundle_list.count('test_1'), 2)
     self.assertEqual(bundle_list.count('test_2'), 1)
-    self.assertEqual(bundle_list.count('description:'), 6)
+    self.assertEqual(bundle_list.count('description:'), 7)
 
   def testUpdateHelp(self):
     '''Test the help for the update command'''
     self.assertRaises(exceptions.SystemExit,
                       sdk_update.main, ['help', 'update'])
 
   def testUpdateBogusBundle(self):
     '''Test running update with a bogus bundle'''
     self.assertRaises(sdk_update.Error,
                       sdk_update.main,
@@ skipping 10 matching lines @@
     test_bundle = manifest_file.GetBundleNamed('test_1')
     self.assertNotEqual(None, test_bundle)
     self.assertTrue('revision' in test_bundle)
     self.assertEqual(1, test_bundle['revision'])
 
   def testNeedsUpdate(self):
     '''Test that the test_1 bundle needs updating'''
     tools = sdk_update.ManifestTools(self._options)
     tools.LoadManifest()
     bundles = tools.GetBundles()
-    self.assertEqual(3, len(bundles))
+    self.assertEqual(4, len(bundles))
     local_manifest = sdk_update.SDKManifestFile(
         os.path.join(self._options.user_data_dir,
                      sdk_update.MANIFEST_FILENAME))
     self.assertNotEqual(None, local_manifest)
     for bundle in bundles:
       bundle_name = bundle['name']
       self.assertTrue('revision' in bundle)
-      if bundle_name == 'test_1':
-        self.assertTrue(local_manifest.BundleNeedsUpdate(bundle))
-      elif bundle_name == 'test_2':
+      if bundle_name in ['test_1', 'test_2', 'pepper_1']:
         self.assertTrue(local_manifest.BundleNeedsUpdate(bundle))
       else:
         self.assertFalse(local_manifest.BundleNeedsUpdate(bundle))
 
   def testMergeManifests(self):
     '''Test merging a Bundle into a manifest file'''
     tools = sdk_update.ManifestTools(self._options)
     tools.LoadManifest()
     bundles = tools.GetBundles()
-    self.assertEqual(3, len(bundles))
+    self.assertEqual(4, len(bundles))
     local_manifest = sdk_update.SDKManifestFile(
         os.path.join(self._options.user_data_dir,
                      sdk_update.MANIFEST_FILENAME))
     self.assertEqual(None, local_manifest.GetBundleNamed('test_2'))
     for bundle in bundles:
       local_manifest.MergeBundle(bundle)
     self.assertNotEqual(None, local_manifest.GetBundleNamed('test_2'))
     for bundle in bundles:
       self.assertFalse(local_manifest.BundleNeedsUpdate(bundle))
 
   def testMergeBundle(self):
     '''Test MergeWithBundle'''
     tools = sdk_update.ManifestTools(self._options)
     tools.LoadManifest()
     bundles = tools.GetBundles()
-    self.assertEqual(3, len(bundles))
+    self.assertEqual(4, len(bundles))
     local_manifest = sdk_update.SDKManifestFile(
         os.path.join(self._options.user_data_dir,
                      sdk_update.MANIFEST_FILENAME))
     self.assertNotEqual(None, local_manifest)
     # Test the | operator.
     for bundle in bundles:
       bundle_name = bundle['name']
-      if bundle_name == 'test_2':
+      if bundle_name in ['pepper_1', 'test_2']:
         continue
       local_test_bundle = local_manifest.GetBundleNamed(bundle_name)
       merged_bundle = local_test_bundle.MergeWithBundle(bundle)
       self.assertTrue('revision' in merged_bundle)
       if bundle_name == 'test_1':
         self.assertEqual(2, merged_bundle['revision'])
       else:
         self.assertEqual(1, merged_bundle['revision'])
       merged_bundle.Validate()
 
   def testVersion(self):
     '''Test that showing the version works'''
     self.assertRaises(exceptions.SystemExit, sdk_update.main, ['--version'])
 
 
 def main():
   suite = unittest.TestLoader().loadTestsFromTestCase(TestSDKUpdate)
   result = unittest.TextTestRunner(verbosity=2).run(suite)
 
   return int(not result.wasSuccessful())
 
 
 if __name__ == '__main__':
   sys.exit(main())