[NaCl SDK] Refactor sdk_update*.

native_client_sdk/src/build_tools/tests/test_sdktools.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 re
 import subprocess
 import sys
 import tarfile
@@ skipping 94 matching lines @@
     archive = manifest_util.Archive('all')
     archive.url = self.server.GetURL('%s/sdk_tools.tgz' % (rel_path,))
     archive.checksum = archive_sha1
     archive.size = archive_size
     return archive
 
   def _Run(self, args):
     naclsdk_shell_script = os.path.join(self.basedir, 'nacl_sdk', 'naclsdk')
     if getos.GetPlatform() == 'win':
       naclsdk_shell_script += '.bat'
-    cmd = [naclsdk_shell_script, '-U', self.server.GetURL(MANIFEST_BASENAME)]
+    cmd = [naclsdk_shell_script]
     cmd.extend(args)
+    cmd.extend(['-U', self.server.GetURL(MANIFEST_BASENAME)])
     process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
     stdout, _ = process.communicate()
     self.assertEqual(process.returncode, 0)
     return stdout
-  
+
   def _RunAndExtractRevision(self):
-    stdout = self._Run(['-v'])
+    stdout = self._Run(['version'])
     match = re.search('version r(\d+)', stdout)
     self.assertTrue(match is not None)
     return int(match.group(1))
 
 
 class TestSdkTools(SdkToolsTestCase):
   def testPathHasSpaces(self):
     """Test that running naclsdk from a path with spaces works."""
     self.SetupWithBaseDirPrefix('sdk tools')
     self._WriteManifest()
@@ skipping 54 matching lines @@
     If the sdk_tools bundle was updated normally (i.e. the old way), it would
     leave a sdk_tools_update folder that would then be copied over on a
     subsequent run. This test ensures that there is no folder made.
     """
     new_revision = self.current_revision + 1
     archive = self._BuildUpdaterArchive('new', new_revision)
     self.sdk_tools_bundle.AddArchive(archive)
     self.sdk_tools_bundle.revision = new_revision
     self._WriteManifest()
 
+    sdk_tools_update_dir = os.path.join(self.basedir, 'nacl_sdk',
+        'sdk_tools_update')
+    self.assertFalse(os.path.exists(sdk_tools_update_dir))
     stdout = self._Run(['update', 'sdk_tools'])
     self.assertTrue(stdout.find('Ignoring manual update request.') != -1)
-    sdk_tools_update_dir = os.path.join(self.basedir, 'nacl_sdk',
-        'sdk_tools_update')
     self.assertFalse(os.path.exists(sdk_tools_update_dir))
 
 
 class TestAutoUpdateSdkToolsDifferentFilesystem(TestAutoUpdateSdkTools):
   def setUp(self):
     # On Linux (on my machine at least), /tmp is a different filesystem than
     # the current directory. os.rename fails when the source and destination
     # are on different filesystems. Test that case here.
     self.SetupWithBaseDirPrefix('sdktools', tmpdir='.')
 
 
 def main():
-  suite = unittest.defaultTestLoader.loadTestsFromModule(sys.modules[__name__])
-  result = unittest.TextTestRunner(verbosity=2).run(suite)
-
-  return int(not result.wasSuccessful())
+  unittest.main()
 
 if __name__ == '__main__':
   sys.exit(main())