[NaCl SDK] Fix bug in "naclsdk update", updating recommended bundles.

native_client_sdk/src/build_tools/tests/sdktools_commands_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 os
 import sys
 import re
 import tarfile
 import tempfile
@@ skipping 209 matching lines @@
   def testUpdateUnknownBundles(self):
     """The update command should ignore unknown bundles and notify the user."""
     self._WriteManifest()
     output = self._Run(['update', 'foobar'])
     self.assertTrue('unknown bundle' in output)
 
   def testUpdateRecommended(self):
     """The update command should update only recommended bundles when run
     without args.
     """
-    bundle = self._AddDummyBundle(self.manifest, 'pepper_26')
-    bundle.recommended = 'yes'
+    bundle_25 = self._AddDummyBundle(self.manifest, 'pepper_25')
+    bundle_25.recommended = 'no'
+    bundle_26 = self._AddDummyBundle(self.manifest, 'pepper_26')
+    bundle_26.recommended = 'yes'
+
     self._WriteManifest()
     output = self._Run(['update'])
+
+    # Should not try to update sdk_tools (even though it is recommended)
+    self.assertTrue('Ignoring manual update request.' not in output)
+    self.assertFalse(os.path.exists(
+        os.path.join(self.basedir, 'nacl_sdk', 'pepper_25')))
     self.assertTrue(os.path.exists(
         os.path.join(self.basedir, 'nacl_sdk', 'pepper_26', 'dummy.txt')))
 
   def testUpdateCanary(self):
     """The update command should create the correct directory name for repath'd
     bundles.
     """
     bundle = self._AddDummyBundle(self.manifest, 'pepper_26')
     bundle.name = 'pepper_canary'
     self._WriteManifest()
-    output = self._Run(['update'])
+    output = self._Run(['update', 'pepper_canary'])
     self.assertTrue(os.path.exists(
         os.path.join(self.basedir, 'nacl_sdk', 'pepper_canary', 'dummy.txt')))
 
   def testUpdateMultiArchive(self):
     """The update command should include download/untar multiple archives
     specified in the bundle.
     """
     bundle = self._AddDummyBundle(self.manifest, 'pepper_26')
     archive2 = self._MakeDummyArchive('pepper_26', tarname='pepper_26_more',
                                       filename='dummy2.txt')
     archive2.host_os = 'all'
     bundle.AddArchive(archive2)
     self._WriteManifest()
-    output = self._Run(['update'])
+    output = self._Run(['update', 'pepper_26'])
     self.assertTrue(os.path.exists(
         os.path.join(self.basedir, 'nacl_sdk', 'pepper_26', 'dummy.txt')))
     self.assertTrue(os.path.exists(
         os.path.join(self.basedir, 'nacl_sdk', 'pepper_26', 'dummy2.txt')))
 
   def testUninstall(self):
     """The uninstall command should remove the installed bundle, if it
     exists.
     """
     # First install the bundle.
@@ skipping 68 matching lines @@
     with open(dummy_txt) as f:
       self.assertEqual(f.read(), 'Dummy stuff for pepper_23')
 
     # ... but the version hasn't been updated.
     output = self._Run(['list', '-r'])
     self.assertTrue(re.search('I\*\s+pepper_23.*?r1337.*?r1338', output))
 
 
 if __name__ == '__main__':
   unittest.main()