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/cbuildbot_unittest.py b/scripts/cbuildbot_unittest.py
index 16a4b4f..b13e2bf 100644
--- a/scripts/cbuildbot_unittest.py
+++ b/scripts/cbuildbot_unittest.py
@@ -14,72 +14,95 @@
class IsDistributedBuilderTest(cros_test_lib.TestCase):
- """Test for cbuildbot._IsDistributedBuilder."""
+ """Test for cbuildbot._IsDistributedBuilder."""
- # pylint: disable=protected-access
- def testIsDistributedBuilder(self):
- """Tests for _IsDistributedBuilder() under various configurations."""
- parser = cbuildbot._CreateParser()
- argv = ['--buildroot', '/foo', 'amd64-generic-paladin']
- options = cbuildbot.ParseCommandLine(parser, argv)
- options.buildbot = False
+ # pylint: disable=protected-access
+ def testIsDistributedBuilder(self):
+ """Tests for _IsDistributedBuilder() under various configurations."""
+ parser = cbuildbot._CreateParser()
+ argv = ["--buildroot", "/foo", "amd64-generic-paladin"]
+ options = cbuildbot.ParseCommandLine(parser, argv)
+ options.buildbot = False
- build_config = dict(manifest_version=False)
- chrome_rev = None
+ build_config = dict(manifest_version=False)
+ chrome_rev = None
- def _TestConfig(expected):
- self.assertEqual(expected,
- cbuildbot._IsDistributedBuilder(
- options=options,
- chrome_rev=chrome_rev,
- build_config=build_config))
+ def _TestConfig(expected):
+ self.assertEqual(
+ expected,
+ cbuildbot._IsDistributedBuilder(
+ options=options,
+ chrome_rev=chrome_rev,
+ build_config=build_config,
+ ),
+ )
- # Default options.
- _TestConfig(False)
+ # Default options.
+ _TestConfig(False)
- build_config['manifest_version'] = True
- # Not running in buildbot mode even though manifest_version=True.
- _TestConfig(False)
- options.buildbot = True
- _TestConfig(True)
+ build_config["manifest_version"] = True
+ # Not running in buildbot mode even though manifest_version=True.
+ _TestConfig(False)
+ options.buildbot = True
+ _TestConfig(True)
- for chrome_rev in (constants.CHROME_REV_TOT,
- constants.CHROME_REV_LOCAL,
- constants.CHROME_REV_SPEC):
- _TestConfig(False)
+ for chrome_rev in (
+ constants.CHROME_REV_TOT,
+ constants.CHROME_REV_LOCAL,
+ constants.CHROME_REV_SPEC,
+ ):
+ _TestConfig(False)
class PostsubmitBuilderTest(cros_test_lib.TestCase):
- """Test for special parameters for ChromeOS Findit Integration."""
+ """Test for special parameters for ChromeOS Findit Integration."""
- def testBuildPackages(self):
- parser = cbuildbot.CreateParser()
- argv = ['--buildroot', '/foo', '--buildbot',
- '--cbb_snapshot_revision', 'hash1234',
- '--cbb_build_packages', 'pkgA pkgB', 'caroline-postsubmit']
- options = cbuildbot.ParseCommandLine(parser, argv)
- expected = ['pkgA', 'pkgB']
- self.assertEqual(expected, options.cbb_build_packages)
- self.assertEqual('hash1234', options.cbb_snapshot_revision)
+ def testBuildPackages(self):
+ parser = cbuildbot.CreateParser()
+ argv = [
+ "--buildroot",
+ "/foo",
+ "--buildbot",
+ "--cbb_snapshot_revision",
+ "hash1234",
+ "--cbb_build_packages",
+ "pkgA pkgB",
+ "caroline-postsubmit",
+ ]
+ options = cbuildbot.ParseCommandLine(parser, argv)
+ expected = ["pkgA", "pkgB"]
+ self.assertEqual(expected, options.cbb_build_packages)
+ self.assertEqual("hash1234", options.cbb_snapshot_revision)
class ParseHWTestDUTDimsTest(cros_test_lib.TestCase):
- """Test for ParseHWTestDUTDims function."""
+ """Test for ParseHWTestDUTDims function."""
- def testParseInvalidDims(self):
- invalid_dims = ['label-board:foo', 'label-model:bar', 'label-pol:baz',
- 'extra:haha']
- with self.assertRaises(cros_build_lib.DieSystemExit):
- cbuildbot.ParseHWTestDUTDims(invalid_dims)
+ def testParseInvalidDims(self):
+ invalid_dims = [
+ "label-board:foo",
+ "label-model:bar",
+ "label-pol:baz",
+ "extra:haha",
+ ]
+ with self.assertRaises(cros_build_lib.DieSystemExit):
+ cbuildbot.ParseHWTestDUTDims(invalid_dims)
- def testParseValidDims(self):
- dimsObject = cbuildbot.ParseHWTestDUTDims([
- 'label-board:foo', 'label-model:bar', 'label-pool:baz', 'a:b', 'c:d'])
- self.assertEqual(dimsObject.board, 'foo')
- self.assertEqual(dimsObject.model, 'bar')
- self.assertEqual(dimsObject.pool, 'baz')
- self.assertEqual(dimsObject.extra_dims, ['a:b', 'c:d'])
+ def testParseValidDims(self):
+ dimsObject = cbuildbot.ParseHWTestDUTDims(
+ [
+ "label-board:foo",
+ "label-model:bar",
+ "label-pool:baz",
+ "a:b",
+ "c:d",
+ ]
+ )
+ self.assertEqual(dimsObject.board, "foo")
+ self.assertEqual(dimsObject.model, "bar")
+ self.assertEqual(dimsObject.pool, "baz")
+ self.assertEqual(dimsObject.extra_dims, ["a:b", "c:d"])
- def testParseNoDims(self):
- self.assertIsNone(cbuildbot.ParseHWTestDUTDims([]))
- self.assertIsNone(cbuildbot.ParseHWTestDUTDims(None))
+ def testParseNoDims(self):
+ self.assertIsNone(cbuildbot.ParseHWTestDUTDims([]))
+ self.assertIsNone(cbuildbot.ParseHWTestDUTDims(None))