commit 629febbc450cdaaff1dd760ca99f085e3a745ecc
author David James <davidjames@chromium.org> Sun Nov 25 13:07:34 2012 -0800
committer Gerrit <chrome-bot@google.com> Wed Nov 28 11:57:46 2012 -0800
tree 694d3c5947e840483b002e06ffce987537c335e9
parent a5d8bd29d07bcf232f928f6a2d3ebc74b9c470df

Make 'chromeos-chrome' a constant.

BUG=none
TEST=Unit tests, chrome trybot.
Change-Id: I0eb862361981374956bdabb890de981bae57c1e0
Reviewed-on: https://gerrit.chromium.org/gerrit/38653
Commit-Ready: David James <davidjames@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>

scripts/cros_generate_sysroot_unittest.py

diff --git a/scripts/cros_generate_sysroot_unittest.py b/scripts/cros_generate_sysroot_unittest.py
index ffb40ad..5d374bf 100755
--- a/scripts/cros_generate_sysroot_unittest.py
+++ b/scripts/cros_generate_sysroot_unittest.py
@@ -10,6 +10,7 @@
 
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)),
                                 '..', '..'))
+from chromite.buildbot import constants
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_test_lib
 from chromite.scripts import cros_generate_sysroot as cros_gen
@@ -46,7 +47,6 @@
 
 BOARD = 'lumpy'
 TAR_NAME = 'test.tar.xz'
-CHROME_PKG = 'chromeos-base/chromeos-chrome'
 
 
 class OverallTest(cros_test_lib.TempDirTestCase):
@@ -65,7 +65,7 @@
     cros_build_lib.IsInsideChroot.returnvalue = True
     cros_gen.main(
         ['--board', BOARD, '--out-dir', self.tempdir,
-         '--out-file', TAR_NAME, '--package', CHROME_PKG])
+         '--out-file', TAR_NAME, '--package', constants.CHROME_CP])
     self.cg_mock.VerifyTarball(os.path.join(self.tempdir, TAR_NAME))
 
 
@@ -77,7 +77,7 @@
   def _Parse(self, extra_args):
     return cros_gen.ParseCommandLine(
         ['--board', BOARD, '--out-dir', self.tempdir,
-         '--package', CHROME_PKG] + extra_args)
+         '--package', constants.CHROME_CP] + extra_args)
 
   def testDefaultTargetName(self):
     """We are getting the right default target name."""
@@ -96,7 +96,7 @@
     """Erroring out on non-existent output dir."""
     options = cros_gen.ParseCommandLine(
         ['--board', BOARD, '--out-dir', self.BAD_TARGET_DIR, '--package',
-         CHROME_PKG])
+         constants.CHROME_CP])
     self.assertRaises(cros_build_lib.DieSystemExit,
                       cros_gen.FinishParsing, options)