Formatting: Format all python code with black.
This CL is probably not what you're looking for, it's only
automated formatting. Ignore it with
`git blame --ignore-rev <revision>` for this commit.
BUG=b:233893248
TEST=CQ
Change-Id: I66591d7a738d241aed3290138c0f68065ab10a6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3879174
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
diff --git a/scripts/cros_generate_sysroot_unittest.py b/scripts/cros_generate_sysroot_unittest.py
index 04dd53c..aa08de2 100644
--- a/scripts/cros_generate_sysroot_unittest.py
+++ b/scripts/cros_generate_sysroot_unittest.py
@@ -20,89 +20,133 @@
class CrosGenMock(partial_mock.PartialMock):
- """Helper class to Mock out cros_generate_sysroot.GenerateSysroot."""
+ """Helper class to Mock out cros_generate_sysroot.GenerateSysroot."""
- TARGET = 'chromite.scripts.cros_generate_sysroot.GenerateSysroot'
- ATTRS = ('_InstallToolchain', '_InstallKernelHeaders',
- '_InstallBuildDependencies')
+ TARGET = "chromite.scripts.cros_generate_sysroot.GenerateSysroot"
+ ATTRS = (
+ "_InstallToolchain",
+ "_InstallKernelHeaders",
+ "_InstallBuildDependencies",
+ )
- TOOLCHAIN = 'toolchain'
- KERNEL_HEADERS = 'kernel_headers'
- BUILD_DEPS = 'build-deps'
+ TOOLCHAIN = "toolchain"
+ KERNEL_HEADERS = "kernel_headers"
+ BUILD_DEPS = "build-deps"
- def _InstallToolchain(self, inst):
- osutils.Touch(os.path.join(inst.sysroot, self.TOOLCHAIN))
+ def _InstallToolchain(self, inst):
+ osutils.Touch(os.path.join(inst.sysroot, self.TOOLCHAIN))
- def _InstallKernelHeaders(self, inst):
- osutils.Touch(os.path.join(inst.sysroot, self.KERNEL_HEADERS))
+ def _InstallKernelHeaders(self, inst):
+ osutils.Touch(os.path.join(inst.sysroot, self.KERNEL_HEADERS))
- def _InstallBuildDependencies(self, inst):
- osutils.Touch(os.path.join(inst.sysroot, self.BUILD_DEPS))
+ def _InstallBuildDependencies(self, inst):
+ osutils.Touch(os.path.join(inst.sysroot, self.BUILD_DEPS))
- def VerifyTarball(self, tarball):
- dir_struct = [Dir('.', []), self.TOOLCHAIN, self.KERNEL_HEADERS,
- self.BUILD_DEPS]
- cros_test_lib.VerifyTarball(tarball, dir_struct)
+ def VerifyTarball(self, tarball):
+ dir_struct = [
+ Dir(".", []),
+ self.TOOLCHAIN,
+ self.KERNEL_HEADERS,
+ self.BUILD_DEPS,
+ ]
+ cros_test_lib.VerifyTarball(tarball, dir_struct)
-BOARD = 'lumpy'
-TAR_NAME = 'test.tar.xz'
+BOARD = "lumpy"
+TAR_NAME = "test.tar.xz"
class OverallTest(cros_test_lib.MockTempDirTestCase):
- """Tests for cros_generate_sysroot."""
+ """Tests for cros_generate_sysroot."""
- def setUp(self):
- self.cg_mock = self.StartPatcher(CrosGenMock())
- self.PatchObject(sudo.SudoKeepAlive, '_IdentifyTTY', return_value='unknown')
+ def setUp(self):
+ self.cg_mock = self.StartPatcher(CrosGenMock())
+ self.PatchObject(
+ sudo.SudoKeepAlive, "_IdentifyTTY", return_value="unknown"
+ )
- def testTarballGeneration(self):
- """End-to-end test of tarball generation."""
- with mock.patch.object(cros_build_lib, 'IsInsideChroot'):
- cros_build_lib.IsInsideChroot.returnvalue = True
- cros_gen.main(
- ['--board', BOARD, '--out-dir', str(self.tempdir),
- '--out-file', TAR_NAME, '--package', constants.CHROME_CP])
- self.cg_mock.VerifyTarball(os.path.join(self.tempdir, TAR_NAME))
+ def testTarballGeneration(self):
+ """End-to-end test of tarball generation."""
+ with mock.patch.object(cros_build_lib, "IsInsideChroot"):
+ cros_build_lib.IsInsideChroot.returnvalue = True
+ cros_gen.main(
+ [
+ "--board",
+ BOARD,
+ "--out-dir",
+ str(self.tempdir),
+ "--out-file",
+ TAR_NAME,
+ "--package",
+ constants.CHROME_CP,
+ ]
+ )
+ self.cg_mock.VerifyTarball(os.path.join(self.tempdir, TAR_NAME))
class InterfaceTest(cros_test_lib.TempDirTestCase):
- """Test Parsing and error checking functionality."""
+ """Test Parsing and error checking functionality."""
- BAD_TARGET_DIR = '/path/to/nowhere'
+ BAD_TARGET_DIR = "/path/to/nowhere"
- def _Parse(self, extra_args):
- return cros_gen.ParseCommandLine(
- ['--board', BOARD, '--out-dir', str(self.tempdir),
- '--package', constants.CHROME_CP] + extra_args)
+ def _Parse(self, extra_args):
+ return cros_gen.ParseCommandLine(
+ [
+ "--board",
+ BOARD,
+ "--out-dir",
+ str(self.tempdir),
+ "--package",
+ constants.CHROME_CP,
+ ]
+ + extra_args
+ )
- def testDefaultTargetName(self):
- """We are getting the right default target name."""
- options = self._Parse([])
- self.assertEqual(
- options.out_file, 'sysroot_chromeos-base_chromeos-chrome.tar.xz')
+ def testDefaultTargetName(self):
+ """We are getting the right default target name."""
+ options = self._Parse([])
+ self.assertEqual(
+ options.out_file, "sysroot_chromeos-base_chromeos-chrome.tar.xz"
+ )
- def testMultiplePkgsTargetName(self):
- """Test getting the right target name with multiple pkgs."""
- pkgs = '%s virtual/target-os' % constants.CHROME_CP
- options = cros_gen.ParseCommandLine(
- ['--board', BOARD, '--out-dir', str(self.tempdir),
- '--package', pkgs])
+ def testMultiplePkgsTargetName(self):
+ """Test getting the right target name with multiple pkgs."""
+ pkgs = "%s virtual/target-os" % constants.CHROME_CP
+ options = cros_gen.ParseCommandLine(
+ [
+ "--board",
+ BOARD,
+ "--out-dir",
+ str(self.tempdir),
+ "--package",
+ pkgs,
+ ]
+ )
- self.assertEqual(
- options.out_file, 'sysroot_chromeos-base_chromeos-chrome.tar.xz')
+ self.assertEqual(
+ options.out_file, "sysroot_chromeos-base_chromeos-chrome.tar.xz"
+ )
- def testExistingTarget(self):
- """Erroring out on pre-existing target."""
- options = self._Parse(['--out-file', TAR_NAME])
- osutils.Touch(os.path.join(self.tempdir, TAR_NAME))
- self.assertRaises(cros_build_lib.DieSystemExit,
- cros_gen.FinishParsing, options)
+ def testExistingTarget(self):
+ """Erroring out on pre-existing target."""
+ options = self._Parse(["--out-file", TAR_NAME])
+ osutils.Touch(os.path.join(self.tempdir, TAR_NAME))
+ self.assertRaises(
+ cros_build_lib.DieSystemExit, cros_gen.FinishParsing, options
+ )
- def testNonExisting(self):
- """Erroring out on non-existent output dir."""
- options = cros_gen.ParseCommandLine(
- ['--board', BOARD, '--out-dir', self.BAD_TARGET_DIR, '--package',
- constants.CHROME_CP])
- self.assertRaises(cros_build_lib.DieSystemExit,
- cros_gen.FinishParsing, options)
+ def testNonExisting(self):
+ """Erroring out on non-existent output dir."""
+ options = cros_gen.ParseCommandLine(
+ [
+ "--board",
+ BOARD,
+ "--out-dir",
+ self.BAD_TARGET_DIR,
+ "--package",
+ constants.CHROME_CP,
+ ]
+ )
+ self.assertRaises(
+ cros_build_lib.DieSystemExit, cros_gen.FinishParsing, options
+ )