commit c89829c99d6f6c2e1dfa25b47b415f257f6d547a
author Daniel Erat <derat@chromium.org> Mon May 12 17:24:21 2014 -0700
committer Daniel Erat <derat@chromium.org> Tue May 13 00:40:49 2014 +0000
tree 256e760585b1225619a743e07e2041753ea8e38d
parent d4edf1177dbf242bb7cebe3045f8b149f22b73d2

chromite: Fix deploy_chrome_unittest.py.

This was broken by 3fd6c7a8.

BUG=none
TEST=deploy_chrome_unittest.py passes in chroot

Change-Id: Iab83332301d81a2380c40b8d823891bd7dea0c72
Reviewed-on: https://chromium-review.googlesource.com/199451
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Daniel Erat <derat@chromium.org>
Tested-by: Daniel Erat <derat@chromium.org>

scripts/deploy_chrome_unittest.py

diff --git a/scripts/deploy_chrome_unittest.py b/scripts/deploy_chrome_unittest.py
index d519730..e0ee919 100755
--- a/scripts/deploy_chrome_unittest.py
+++ b/scripts/deploy_chrome_unittest.py
@@ -259,21 +259,21 @@
     osutils.Touch(os.path.join(self.build_dir, 'chrome'), makedirs=True)
     self.assertRaises(
         chrome_util.MissingPathError, deploy_chrome._PrepareStagingDir,
-        options, self.tempdir, self.staging_dir, chrome_util._COPY_PATHS)
+        options, self.tempdir, self.staging_dir, chrome_util._COPY_PATHS_CHROME)
 
   def testSloppyDeployFailure(self):
     """Sloppy staging enforces that at least one file is copied."""
     options, _ = _ParseCommandLine(self.common_flags + ['--sloppy'])
     self.assertRaises(
         chrome_util.MissingPathError, deploy_chrome._PrepareStagingDir,
-        options, self.tempdir, self.staging_dir, chrome_util._COPY_PATHS)
+        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'])
     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_util._COPY_PATHS_CHROME)
 
   def testEmptyDeployStrict(self):
     """Strict staging fails when there are no files."""
@@ -282,7 +282,7 @@
 
     self.assertRaises(
         chrome_util.MissingPathError, deploy_chrome._PrepareStagingDir,
-        options, self.tempdir, self.staging_dir, chrome_util._COPY_PATHS)
+        options, self.tempdir, self.staging_dir, chrome_util._COPY_PATHS_CHROME)
 
 
 class DeployTestBuildDir(cros_test_lib.MockTempDirTestCase):