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/api/controller/controller_util_unittest.py b/api/controller/controller_util_unittest.py
index 53f3570..80dd7e4 100644
--- a/api/controller/controller_util_unittest.py
+++ b/api/controller/controller_util_unittest.py
@@ -16,201 +16,214 @@
class ParseChrootTest(cros_test_lib.MockTestCase):
- """ParseChroot tests."""
+ """ParseChroot tests."""
- def testSuccess(self):
- """Test successful handling case."""
- path = '/chroot/path'
- cache_dir = '/cache/dir'
- chrome_root = '/chrome/root'
- use_flags = [{'flag': 'useflag1'}, {'flag': 'useflag2'}]
- features = [{'feature': 'feature1'}, {'feature': 'feature2'}]
- expected_env = {'USE': 'useflag1 useflag2',
- 'FEATURES': 'feature1 feature2',
- 'CHROME_ORIGIN': 'LOCAL_SOURCE'}
+ def testSuccess(self):
+ """Test successful handling case."""
+ path = "/chroot/path"
+ cache_dir = "/cache/dir"
+ chrome_root = "/chrome/root"
+ use_flags = [{"flag": "useflag1"}, {"flag": "useflag2"}]
+ features = [{"feature": "feature1"}, {"feature": "feature2"}]
+ expected_env = {
+ "USE": "useflag1 useflag2",
+ "FEATURES": "feature1 feature2",
+ "CHROME_ORIGIN": "LOCAL_SOURCE",
+ }
- chroot_message = common_pb2.Chroot(path=path, cache_dir=cache_dir,
- chrome_dir=chrome_root,
- env={'use_flags': use_flags,
- 'features': features})
+ chroot_message = common_pb2.Chroot(
+ path=path,
+ cache_dir=cache_dir,
+ chrome_dir=chrome_root,
+ env={"use_flags": use_flags, "features": features},
+ )
- expected = Chroot(path=path, cache_dir=cache_dir, chrome_root=chrome_root,
- env=expected_env)
- result = controller_util.ParseChroot(chroot_message)
+ expected = Chroot(
+ path=path,
+ cache_dir=cache_dir,
+ chrome_root=chrome_root,
+ env=expected_env,
+ )
+ result = controller_util.ParseChroot(chroot_message)
- self.assertEqual(expected, result)
+ self.assertEqual(expected, result)
- def testWrongMessage(self):
- """Test invalid message type given."""
- with self.assertRaises(AssertionError):
- controller_util.ParseChroot(common_pb2.BuildTarget())
+ def testWrongMessage(self):
+ """Test invalid message type given."""
+ with self.assertRaises(AssertionError):
+ controller_util.ParseChroot(common_pb2.BuildTarget())
+
class ParseSysrootTest(cros_test_lib.MockTestCase):
- """ParseSysroot tests."""
+ """ParseSysroot tests."""
- def testSuccess(self):
- """test successful handling case."""
- path = '/build/rare_pokemon'
- sysroot_message = sysroot_pb2.Sysroot(path=path)
- expected = Sysroot(path=path)
- result = controller_util.ParseSysroot(sysroot_message)
- self.assertEqual(expected, result)
+ def testSuccess(self):
+ """test successful handling case."""
+ path = "/build/rare_pokemon"
+ sysroot_message = sysroot_pb2.Sysroot(path=path)
+ expected = Sysroot(path=path)
+ result = controller_util.ParseSysroot(sysroot_message)
+ self.assertEqual(expected, result)
- def testWrongMessage(self):
- with self.assertRaises(AssertionError):
- controller_util.ParseSysroot(common_pb2.BuildTarget())
+ def testWrongMessage(self):
+ with self.assertRaises(AssertionError):
+ controller_util.ParseSysroot(common_pb2.BuildTarget())
+
class ParseBuildTargetTest(cros_test_lib.TestCase):
- """ParseBuildTarget tests."""
+ """ParseBuildTarget tests."""
- def testSuccess(self):
- """Test successful handling case."""
- name = 'board'
- build_target_message = common_pb2.BuildTarget(name=name)
- expected = build_target_lib.BuildTarget(name)
- result = controller_util.ParseBuildTarget(build_target_message)
+ def testSuccess(self):
+ """Test successful handling case."""
+ name = "board"
+ build_target_message = common_pb2.BuildTarget(name=name)
+ expected = build_target_lib.BuildTarget(name)
+ result = controller_util.ParseBuildTarget(build_target_message)
- self.assertEqual(expected, result)
+ self.assertEqual(expected, result)
- def testParseProfile(self):
- """Test the parsing of a profile."""
- name = 'build-target-name'
- profile = 'profile'
- build_target_msg = common_pb2.BuildTarget(name=name)
- profile_msg = sysroot_pb2.Profile(name=profile)
+ def testParseProfile(self):
+ """Test the parsing of a profile."""
+ name = "build-target-name"
+ profile = "profile"
+ build_target_msg = common_pb2.BuildTarget(name=name)
+ profile_msg = sysroot_pb2.Profile(name=profile)
- expected = build_target_lib.BuildTarget(name, profile=profile)
- result = controller_util.ParseBuildTarget(
- build_target_msg, profile_message=profile_msg)
+ expected = build_target_lib.BuildTarget(name, profile=profile)
+ result = controller_util.ParseBuildTarget(
+ build_target_msg, profile_message=profile_msg
+ )
- self.assertEqual(expected, result)
+ self.assertEqual(expected, result)
-
- def testWrongMessage(self):
- """Test invalid message type given."""
- with self.assertRaises(AssertionError):
- controller_util.ParseBuildTarget(build_api_test_pb2.TestRequestMessage())
+ def testWrongMessage(self):
+ """Test invalid message type given."""
+ with self.assertRaises(AssertionError):
+ controller_util.ParseBuildTarget(
+ build_api_test_pb2.TestRequestMessage()
+ )
class ParseBuildTargetsTest(cros_test_lib.TestCase):
- """ParseBuildTargets tests."""
+ """ParseBuildTargets tests."""
- def testSuccess(self):
- """Test successful handling case."""
- names = ['foo', 'bar', 'baz']
- message = build_api_test_pb2.TestRequestMessage()
- for name in names:
- message.build_targets.add().name = name
+ def testSuccess(self):
+ """Test successful handling case."""
+ names = ["foo", "bar", "baz"]
+ message = build_api_test_pb2.TestRequestMessage()
+ for name in names:
+ message.build_targets.add().name = name
- result = controller_util.ParseBuildTargets(message.build_targets)
+ result = controller_util.ParseBuildTargets(message.build_targets)
- expected = [build_target_lib.BuildTarget(name) for name in names]
- self.assertCountEqual(expected, result)
+ expected = [build_target_lib.BuildTarget(name) for name in names]
+ self.assertCountEqual(expected, result)
- def testWrongMessage(self):
- """Wrong message type handling."""
- message = common_pb2.Chroot()
- message.env.use_flags.add().flag = 'foo'
- message.env.use_flags.add().flag = 'bar'
+ def testWrongMessage(self):
+ """Wrong message type handling."""
+ message = common_pb2.Chroot()
+ message.env.use_flags.add().flag = "foo"
+ message.env.use_flags.add().flag = "bar"
- with self.assertRaises(AssertionError):
- controller_util.ParseBuildTargets(message.env.use_flags)
+ with self.assertRaises(AssertionError):
+ controller_util.ParseBuildTargets(message.env.use_flags)
class PackageInfoToCPVTest(cros_test_lib.TestCase):
- """PackageInfoToCPV tests."""
+ """PackageInfoToCPV tests."""
- def testAllFields(self):
- """Quick check CPV fields."""
- pi = common_pb2.PackageInfo()
- pi.package_name = 'pkg'
- pi.category = 'cat'
- pi.version = '2.0.0'
+ def testAllFields(self):
+ """Quick check CPV fields."""
+ pi = common_pb2.PackageInfo()
+ pi.package_name = "pkg"
+ pi.category = "cat"
+ pi.version = "2.0.0"
- cpv = controller_util.PackageInfoToCPV(pi)
+ cpv = controller_util.PackageInfoToCPV(pi)
- self.assertEqual('pkg', cpv.package)
- self.assertEqual('cat', cpv.category)
- self.assertEqual('2.0.0', cpv.version)
+ self.assertEqual("pkg", cpv.package)
+ self.assertEqual("cat", cpv.category)
+ self.assertEqual("2.0.0", cpv.version)
- def testNoPackageInfo(self):
- """Test no package info given."""
- self.assertIsNone(controller_util.PackageInfoToCPV(None))
+ def testNoPackageInfo(self):
+ """Test no package info given."""
+ self.assertIsNone(controller_util.PackageInfoToCPV(None))
- def testNoPackageName(self):
- """Test no package name given."""
- pi = common_pb2.PackageInfo()
- pi.category = 'cat'
- pi.version = '2.0.0'
+ def testNoPackageName(self):
+ """Test no package name given."""
+ pi = common_pb2.PackageInfo()
+ pi.category = "cat"
+ pi.version = "2.0.0"
- self.assertIsNone(controller_util.PackageInfoToCPV(pi))
+ self.assertIsNone(controller_util.PackageInfoToCPV(pi))
class PackageInfoToStringTest(cros_test_lib.TestCase):
- """PackageInfoToString tests."""
+ """PackageInfoToString tests."""
- def testAllFields(self):
- """Test all fields present."""
- pi = common_pb2.PackageInfo()
- pi.package_name = 'pkg'
- pi.category = 'cat'
- pi.version = '2.0.0'
+ def testAllFields(self):
+ """Test all fields present."""
+ pi = common_pb2.PackageInfo()
+ pi.package_name = "pkg"
+ pi.category = "cat"
+ pi.version = "2.0.0"
- cpv_str = controller_util.PackageInfoToString(pi)
+ cpv_str = controller_util.PackageInfoToString(pi)
- self.assertEqual('cat/pkg-2.0.0', cpv_str)
+ self.assertEqual("cat/pkg-2.0.0", cpv_str)
- def testNoVersion(self):
- """Test no version provided."""
- pi = common_pb2.PackageInfo()
- pi.package_name = 'pkg'
- pi.category = 'cat'
+ def testNoVersion(self):
+ """Test no version provided."""
+ pi = common_pb2.PackageInfo()
+ pi.package_name = "pkg"
+ pi.category = "cat"
- cpv_str = controller_util.PackageInfoToString(pi)
+ cpv_str = controller_util.PackageInfoToString(pi)
- self.assertEqual('cat/pkg', cpv_str)
+ self.assertEqual("cat/pkg", cpv_str)
- def testPackageOnly(self):
- """Test no version provided."""
- pi = common_pb2.PackageInfo()
- pi.package_name = 'pkg'
+ def testPackageOnly(self):
+ """Test no version provided."""
+ pi = common_pb2.PackageInfo()
+ pi.package_name = "pkg"
- cpv_str = controller_util.PackageInfoToString(pi)
+ cpv_str = controller_util.PackageInfoToString(pi)
- self.assertEqual('pkg', cpv_str)
+ self.assertEqual("pkg", cpv_str)
- def testNoPackageName(self):
- """Test no package name given."""
- pi = common_pb2.PackageInfo()
+ def testNoPackageName(self):
+ """Test no package name given."""
+ pi = common_pb2.PackageInfo()
- with self.assertRaises(ValueError):
- controller_util.PackageInfoToString(pi)
+ with self.assertRaises(ValueError):
+ controller_util.PackageInfoToString(pi)
def test_serialize_package_info():
- pkg_info = package_info.parse('foo/bar-1.2.3-r4')
- pkg_info_msg = common_pb2.PackageInfo()
- controller_util.serialize_package_info(pkg_info, pkg_info_msg)
- assert pkg_info_msg.category == 'foo'
- assert pkg_info_msg.package_name == 'bar'
- assert pkg_info_msg.version == '1.2.3-r4'
+ pkg_info = package_info.parse("foo/bar-1.2.3-r4")
+ pkg_info_msg = common_pb2.PackageInfo()
+ controller_util.serialize_package_info(pkg_info, pkg_info_msg)
+ assert pkg_info_msg.category == "foo"
+ assert pkg_info_msg.package_name == "bar"
+ assert pkg_info_msg.version == "1.2.3-r4"
def test_deserialize_package_info():
- pkg_info_msg = common_pb2.PackageInfo()
- pkg_info_msg.category = 'foo'
- pkg_info_msg.package_name = 'bar'
- pkg_info_msg.version = '1.2.3-r4'
- pkg_info = controller_util.deserialize_package_info(pkg_info_msg)
- assert pkg_info.cpvr == 'foo/bar-1.2.3-r4'
+ pkg_info_msg = common_pb2.PackageInfo()
+ pkg_info_msg.category = "foo"
+ pkg_info_msg.package_name = "bar"
+ pkg_info_msg.version = "1.2.3-r4"
+ pkg_info = controller_util.deserialize_package_info(pkg_info_msg)
+ assert pkg_info.cpvr == "foo/bar-1.2.3-r4"
def test_retrieve_package_log_paths():
- packages = [package_info.parse('foo/bar%d-1.0-r1' % num)
- for num in range(1, 4)]
- output_proto = sysroot_pb2.InstallPackagesResponse()
- target_sysroot = Sysroot(path='/path/to/sysroot')
- controller_util.retrieve_package_log_paths(packages,
- output_proto,
- target_sysroot)
- assert len(output_proto.failed_package_data) == 3
+ packages = [
+ package_info.parse("foo/bar%d-1.0-r1" % num) for num in range(1, 4)
+ ]
+ output_proto = sysroot_pb2.InstallPackagesResponse()
+ target_sysroot = Sysroot(path="/path/to/sysroot")
+ controller_util.retrieve_package_log_paths(
+ packages, output_proto, target_sysroot
+ )
+ assert len(output_proto.failed_package_data) == 3