Reformat python files checked by pylint (part 1/2).
After recently changing .pylintrc (see [1]) we discovered that
the presubmit check always checks all the python files when just
one python file gets updated.
This CL moves all these files one step closer to what the linter
wants.
Autogenerated with:
# Added all the files under pylint control to ~/Desktop/to-reformat
cat ~/Desktop/to-reformat | xargs sed -i '1i\\'
git cl format --python --full
This is part 1 out of 2. The second part will fix function names and
will not be automated.
[1] - https://webrtc-review.googlesource.com/c/src/+/186664
No-Presubmit: True
Bug: webrtc:12114
Change-Id: Idfec4d759f209a2090440d0af2413a1ddc01b841
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190980
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32530}
diff --git a/tools_webrtc/libs/generate_licenses_test.py b/tools_webrtc/libs/generate_licenses_test.py
index fa05eaa..51acb89 100755
--- a/tools_webrtc/libs/generate_licenses_test.py
+++ b/tools_webrtc/libs/generate_licenses_test.py
@@ -16,10 +16,9 @@
class TestLicenseBuilder(unittest.TestCase):
-
- @staticmethod
- def _FakeRunGN(buildfile_dir, target):
- return """
+ @staticmethod
+ def _FakeRunGN(buildfile_dir, target):
+ return """
{
"target1": {
"deps": [
@@ -32,91 +31,93 @@
}
"""
- def testParseLibraryName(self):
- self.assertEquals(
- LicenseBuilder._ParseLibraryName('//a/b/third_party/libname1:c'),
- 'libname1')
- self.assertEquals(
- LicenseBuilder._ParseLibraryName('//a/b/third_party/libname2:c(d)'),
- 'libname2')
- self.assertEquals(
- LicenseBuilder._ParseLibraryName('//a/b/third_party/libname3/c:d(e)'),
- 'libname3')
- self.assertEquals(
- LicenseBuilder._ParseLibraryName('//a/b/not_third_party/c'), None)
+ def testParseLibraryName(self):
+ self.assertEquals(
+ LicenseBuilder._ParseLibraryName('//a/b/third_party/libname1:c'),
+ 'libname1')
+ self.assertEquals(
+ LicenseBuilder._ParseLibraryName(
+ '//a/b/third_party/libname2:c(d)'), 'libname2')
+ self.assertEquals(
+ LicenseBuilder._ParseLibraryName(
+ '//a/b/third_party/libname3/c:d(e)'), 'libname3')
+ self.assertEquals(
+ LicenseBuilder._ParseLibraryName('//a/b/not_third_party/c'), None)
- def testParseLibrarySimpleMatch(self):
- builder = LicenseBuilder([], [], {}, {})
- self.assertEquals(
- builder._ParseLibrary('//a/b/third_party/libname:c'), 'libname')
+ def testParseLibrarySimpleMatch(self):
+ builder = LicenseBuilder([], [], {}, {})
+ self.assertEquals(builder._ParseLibrary('//a/b/third_party/libname:c'),
+ 'libname')
- def testParseLibraryRegExNoMatchFallbacksToDefaultLibname(self):
- lib_dict = {
- 'libname:foo.*': ['path/to/LICENSE'],
- }
- builder = LicenseBuilder([], [], lib_dict, {})
- self.assertEquals(
- builder._ParseLibrary('//a/b/third_party/libname:bar_java'), 'libname')
+ def testParseLibraryRegExNoMatchFallbacksToDefaultLibname(self):
+ lib_dict = {
+ 'libname:foo.*': ['path/to/LICENSE'],
+ }
+ builder = LicenseBuilder([], [], lib_dict, {})
+ self.assertEquals(
+ builder._ParseLibrary('//a/b/third_party/libname:bar_java'),
+ 'libname')
- def testParseLibraryRegExMatch(self):
- lib_regex_dict = {
- 'libname:foo.*': ['path/to/LICENSE'],
- }
- builder = LicenseBuilder([], [], {}, lib_regex_dict)
- self.assertEquals(
- builder._ParseLibrary('//a/b/third_party/libname:foo_bar_java'),
- 'libname:foo.*')
+ def testParseLibraryRegExMatch(self):
+ lib_regex_dict = {
+ 'libname:foo.*': ['path/to/LICENSE'],
+ }
+ builder = LicenseBuilder([], [], {}, lib_regex_dict)
+ self.assertEquals(
+ builder._ParseLibrary('//a/b/third_party/libname:foo_bar_java'),
+ 'libname:foo.*')
- def testParseLibraryRegExMatchWithSubDirectory(self):
- lib_regex_dict = {
- 'libname/foo:bar.*': ['path/to/LICENSE'],
- }
- builder = LicenseBuilder([], [], {}, lib_regex_dict)
- self.assertEquals(
- builder._ParseLibrary('//a/b/third_party/libname/foo:bar_java'),
- 'libname/foo:bar.*')
+ def testParseLibraryRegExMatchWithSubDirectory(self):
+ lib_regex_dict = {
+ 'libname/foo:bar.*': ['path/to/LICENSE'],
+ }
+ builder = LicenseBuilder([], [], {}, lib_regex_dict)
+ self.assertEquals(
+ builder._ParseLibrary('//a/b/third_party/libname/foo:bar_java'),
+ 'libname/foo:bar.*')
- def testParseLibraryRegExMatchWithStarInside(self):
- lib_regex_dict = {
- 'libname/foo.*bar.*': ['path/to/LICENSE'],
- }
- builder = LicenseBuilder([], [], {}, lib_regex_dict)
- self.assertEquals(
- builder._ParseLibrary('//a/b/third_party/libname/fooHAHA:bar_java'),
- 'libname/foo.*bar.*')
+ def testParseLibraryRegExMatchWithStarInside(self):
+ lib_regex_dict = {
+ 'libname/foo.*bar.*': ['path/to/LICENSE'],
+ }
+ builder = LicenseBuilder([], [], {}, lib_regex_dict)
+ self.assertEquals(
+ builder._ParseLibrary(
+ '//a/b/third_party/libname/fooHAHA:bar_java'),
+ 'libname/foo.*bar.*')
- @mock.patch('generate_licenses.LicenseBuilder._RunGN', _FakeRunGN)
- def testGetThirdPartyLibrariesWithoutRegex(self):
- builder = LicenseBuilder([], [], {}, {})
- self.assertEquals(
- builder._GetThirdPartyLibraries('out/arm', 'target1'),
- set(['libname1', 'libname2', 'libname3']))
+ @mock.patch('generate_licenses.LicenseBuilder._RunGN', _FakeRunGN)
+ def testGetThirdPartyLibrariesWithoutRegex(self):
+ builder = LicenseBuilder([], [], {}, {})
+ self.assertEquals(
+ builder._GetThirdPartyLibraries('out/arm', 'target1'),
+ set(['libname1', 'libname2', 'libname3']))
- @mock.patch('generate_licenses.LicenseBuilder._RunGN', _FakeRunGN)
- def testGetThirdPartyLibrariesWithRegex(self):
- lib_regex_dict = {
- 'libname2:c.*': ['path/to/LICENSE'],
- }
- builder = LicenseBuilder([], [], {}, lib_regex_dict)
- self.assertEquals(
- builder._GetThirdPartyLibraries('out/arm', 'target1'),
- set(['libname1', 'libname2:c.*', 'libname3']))
+ @mock.patch('generate_licenses.LicenseBuilder._RunGN', _FakeRunGN)
+ def testGetThirdPartyLibrariesWithRegex(self):
+ lib_regex_dict = {
+ 'libname2:c.*': ['path/to/LICENSE'],
+ }
+ builder = LicenseBuilder([], [], {}, lib_regex_dict)
+ self.assertEquals(
+ builder._GetThirdPartyLibraries('out/arm', 'target1'),
+ set(['libname1', 'libname2:c.*', 'libname3']))
- @mock.patch('generate_licenses.LicenseBuilder._RunGN', _FakeRunGN)
- def testGenerateLicenseTextFailIfUnknownLibrary(self):
- lib_dict = {
- 'simple_library': ['path/to/LICENSE'],
- }
- builder = LicenseBuilder(['dummy_dir'], ['dummy_target'], lib_dict, {})
+ @mock.patch('generate_licenses.LicenseBuilder._RunGN', _FakeRunGN)
+ def testGenerateLicenseTextFailIfUnknownLibrary(self):
+ lib_dict = {
+ 'simple_library': ['path/to/LICENSE'],
+ }
+ builder = LicenseBuilder(['dummy_dir'], ['dummy_target'], lib_dict, {})
- with self.assertRaises(Exception) as context:
- builder.GenerateLicenseText('dummy/dir')
+ with self.assertRaises(Exception) as context:
+ builder.GenerateLicenseText('dummy/dir')
- self.assertEquals(
- context.exception.message,
- 'Missing licenses for following third_party targets: '
- 'libname1, libname2, libname3')
+ self.assertEquals(
+ context.exception.message,
+ 'Missing licenses for following third_party targets: '
+ 'libname1, libname2, libname3')
if __name__ == '__main__':
- unittest.main()
+ unittest.main()