[NaCl SDK] Fix update issues in sdk_tools.

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 204 matching lines @@
     # Now update using --force.
     output = self._Run(['update', 'pepper_23', '--force'])
     self.assertTrue('Updating bundle' in output)
 
   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'
+    self._WriteManifest()
+    output = self._Run(['update'])
+    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'])
+    self.assertTrue(os.path.exists(
+        os.path.join(self.basedir, 'nacl_sdk', 'pepper_canary', 'dummy.txt')))
+
 
 if __name__ == '__main__':
-  sys.exit(unittest.main())
+  unittest.main()