commit c3061a63c2caa1708b34d509a9a0256011209cbf
author Mike Frysinger <vapier@chromium.org> Thu Jun 04 04:16:18 2015 -0400
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri Jun 05 19:35:15 2015 +0000
tree 9ae984bc24bd237bc3afbc91169f4963032ff568
parent ec6a49fbf8f0defe62e35ddbc8fdcd68fb1973d7

deploy_chrome: convert to commandline.ArgumentParser

BUG=chromium:496565
TEST=precq passes and chrome still installs

Change-Id: I4f1a8fc756cf34e69f09053d1c62aa7c06525726
Reviewed-on: https://chromium-review.googlesource.com/275620
Trybot-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/deploy_chrome_unittest.py

diff --git a/scripts/deploy_chrome_unittest.py b/scripts/deploy_chrome_unittest.py
index 9845472..151058b 100644
--- a/scripts/deploy_chrome_unittest.py
+++ b/scripts/deploy_chrome_unittest.py
@@ -81,24 +81,24 @@
 
   def testMountOptionSetsTargetDir(self):
     argv = list(_REGULAR_TO) + ['--gs-path', _GS_PATH, '--mount']
-    options, _ = _ParseCommandLine(argv)
+    options = _ParseCommandLine(argv)
     self.assertIsNot(options.target_dir, None)
 
   def testMountOptionSetsMountDir(self):
     argv = list(_REGULAR_TO) + ['--gs-path', _GS_PATH, '--mount']
-    options, _ = _ParseCommandLine(argv)
+    options = _ParseCommandLine(argv)
     self.assertIsNot(options.mount_dir, None)
 
   def testMountOptionDoesNotOverrideTargetDir(self):
     argv = list(_REGULAR_TO) + ['--gs-path', _GS_PATH, '--mount',
                                 '--target-dir', '/foo/bar/cow']
-    options, _ = _ParseCommandLine(argv)
+    options = _ParseCommandLine(argv)
     self.assertEqual(options.target_dir, '/foo/bar/cow')
 
   def testMountOptionDoesNotOverrideMountDir(self):
     argv = list(_REGULAR_TO) + ['--gs-path', _GS_PATH, '--mount',
                                 '--mount-dir', '/foo/bar/cow']
-    options, _ = _ParseCommandLine(argv)
+    options = _ParseCommandLine(argv)
     self.assertEqual(options.mount_dir, '/foo/bar/cow')
 
 
@@ -164,7 +164,7 @@
   """Setup a deploy object with a GS-path for use in tests."""
 
   def _GetDeployChrome(self, args):
-    options, _ = _ParseCommandLine(args)
+    options = _ParseCommandLine(args)
     return deploy_chrome.DeployChrome(
         options, self.tempdir, os.path.join(self.tempdir, 'staging'))
 
@@ -261,7 +261,7 @@
 
   def testSingleFileDeployFailure(self):
     """Default staging enforces that mandatory files are copied"""
-    options, _ = _ParseCommandLine(self.common_flags)
+    options = _ParseCommandLine(self.common_flags)
     osutils.Touch(os.path.join(self.build_dir, 'chrome'), makedirs=True)
     self.assertRaises(
         chrome_util.MissingPathError, deploy_chrome._PrepareStagingDir,
@@ -269,21 +269,21 @@
 
   def testSloppyDeployFailure(self):
     """Sloppy staging enforces that at least one file is copied."""
-    options, _ = _ParseCommandLine(self.common_flags + ['--sloppy'])
+    options = _ParseCommandLine(self.common_flags + ['--sloppy'])
     self.assertRaises(
         chrome_util.MissingPathError, deploy_chrome._PrepareStagingDir,
         options, self.tempdir, self.staging_dir, chrome_util._COPY_PATHS_CHROME)
 
   def testSloppyDeploySuccess(self):
     """Sloppy staging - stage one file."""
-    options, _ = _ParseCommandLine(self.common_flags + ['--sloppy'])
+    options = _ParseCommandLine(self.common_flags + ['--sloppy'])
     osutils.Touch(os.path.join(self.build_dir, 'chrome'), makedirs=True)
     deploy_chrome._PrepareStagingDir(options, self.tempdir, self.staging_dir,
                                      chrome_util._COPY_PATHS_CHROME)
 
   def testEmptyDeployStrict(self):
     """Strict staging fails when there are no files."""
-    options, _ = _ParseCommandLine(
+    options = _ParseCommandLine(
         self.common_flags + ['--gyp-defines', 'chromeos=1', '--strict'])
 
     self.assertRaises(
@@ -295,7 +295,7 @@
   """Set up a deploy object with a build-dir for use in deployment type tests"""
 
   def _GetDeployChrome(self, args):
-    options, _ = _ParseCommandLine(args)
+    options = _ParseCommandLine(args)
     return deploy_chrome.DeployChrome(
         options, self.tempdir, os.path.join(self.tempdir, 'staging'))