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/gtest_parallel_wrapper_test.py b/tools_webrtc/gtest_parallel_wrapper_test.py
index 26135e1..82cb75b 100755
--- a/tools_webrtc/gtest_parallel_wrapper_test.py
+++ b/tools_webrtc/gtest_parallel_wrapper_test.py
@@ -21,149 +21,152 @@
@contextmanager
def TemporaryDirectory():
- tmp_dir = tempfile.mkdtemp()
- yield tmp_dir
- os.rmdir(tmp_dir)
+ tmp_dir = tempfile.mkdtemp()
+ yield tmp_dir
+ os.rmdir(tmp_dir)
class GtestParallelWrapperHelpersTest(unittest.TestCase):
+ def testGetWorkersAsIs(self):
+ # pylint: disable=protected-access
+ self.assertEqual(gtest_parallel_wrapper._ParseWorkersOption('12'), 12)
- def testGetWorkersAsIs(self):
- # pylint: disable=protected-access
- self.assertEqual(gtest_parallel_wrapper._ParseWorkersOption('12'), 12)
+ def testGetTwiceWorkers(self):
+ expected = 2 * multiprocessing.cpu_count()
+ # pylint: disable=protected-access
+ self.assertEqual(gtest_parallel_wrapper._ParseWorkersOption('2x'),
+ expected)
- def testGetTwiceWorkers(self):
- expected = 2 * multiprocessing.cpu_count()
- # pylint: disable=protected-access
- self.assertEqual(gtest_parallel_wrapper._ParseWorkersOption('2x'), expected)
-
- def testGetHalfWorkers(self):
- expected = max(multiprocessing.cpu_count() // 2, 1)
- # pylint: disable=protected-access
- self.assertEqual(
- gtest_parallel_wrapper._ParseWorkersOption('0.5x'), expected)
+ def testGetHalfWorkers(self):
+ expected = max(multiprocessing.cpu_count() // 2, 1)
+ # pylint: disable=protected-access
+ self.assertEqual(gtest_parallel_wrapper._ParseWorkersOption('0.5x'),
+ expected)
class GtestParallelWrapperTest(unittest.TestCase):
+ @classmethod
+ def _Expected(cls, gtest_parallel_args):
+ return ['--shard_index=0', '--shard_count=1'] + gtest_parallel_args
- @classmethod
- def _Expected(cls, gtest_parallel_args):
- return ['--shard_index=0', '--shard_count=1'] + gtest_parallel_args
+ def testOverwrite(self):
+ result = gtest_parallel_wrapper.ParseArgs(
+ ['--timeout=123', 'exec', '--timeout', '124'])
+ expected = self._Expected(['--timeout=124', 'exec'])
+ self.assertEqual(result.gtest_parallel_args, expected)
- def testOverwrite(self):
- result = gtest_parallel_wrapper.ParseArgs(
- ['--timeout=123', 'exec', '--timeout', '124'])
- expected = self._Expected(['--timeout=124', 'exec'])
- self.assertEqual(result.gtest_parallel_args, expected)
+ def testMixing(self):
+ result = gtest_parallel_wrapper.ParseArgs([
+ '--timeout=123', '--param1', 'exec', '--param2', '--timeout', '124'
+ ])
+ expected = self._Expected(
+ ['--timeout=124', 'exec', '--', '--param1', '--param2'])
+ self.assertEqual(result.gtest_parallel_args, expected)
- def testMixing(self):
- result = gtest_parallel_wrapper.ParseArgs(
- ['--timeout=123', '--param1', 'exec', '--param2', '--timeout', '124'])
- expected = self._Expected(
- ['--timeout=124', 'exec', '--', '--param1', '--param2'])
- self.assertEqual(result.gtest_parallel_args, expected)
+ def testMixingPositional(self):
+ result = gtest_parallel_wrapper.ParseArgs([
+ '--timeout=123', 'exec', '--foo1', 'bar1', '--timeout', '124',
+ '--foo2', 'bar2'
+ ])
+ expected = self._Expected([
+ '--timeout=124', 'exec', '--', '--foo1', 'bar1', '--foo2', 'bar2'
+ ])
+ self.assertEqual(result.gtest_parallel_args, expected)
- def testMixingPositional(self):
- result = gtest_parallel_wrapper.ParseArgs([
- '--timeout=123', 'exec', '--foo1', 'bar1', '--timeout', '124', '--foo2',
- 'bar2'
- ])
- expected = self._Expected(
- ['--timeout=124', 'exec', '--', '--foo1', 'bar1', '--foo2', 'bar2'])
- self.assertEqual(result.gtest_parallel_args, expected)
+ def testDoubleDash1(self):
+ result = gtest_parallel_wrapper.ParseArgs(
+ ['--timeout', '123', 'exec', '--', '--timeout', '124'])
+ expected = self._Expected(
+ ['--timeout=123', 'exec', '--', '--timeout', '124'])
+ self.assertEqual(result.gtest_parallel_args, expected)
- def testDoubleDash1(self):
- result = gtest_parallel_wrapper.ParseArgs(
- ['--timeout', '123', 'exec', '--', '--timeout', '124'])
- expected = self._Expected(
- ['--timeout=123', 'exec', '--', '--timeout', '124'])
- self.assertEqual(result.gtest_parallel_args, expected)
+ def testDoubleDash2(self):
+ result = gtest_parallel_wrapper.ParseArgs(
+ ['--timeout=123', '--', 'exec', '--timeout=124'])
+ expected = self._Expected(
+ ['--timeout=123', 'exec', '--', '--timeout=124'])
+ self.assertEqual(result.gtest_parallel_args, expected)
- def testDoubleDash2(self):
- result = gtest_parallel_wrapper.ParseArgs(
- ['--timeout=123', '--', 'exec', '--timeout=124'])
- expected = self._Expected(['--timeout=123', 'exec', '--', '--timeout=124'])
- self.assertEqual(result.gtest_parallel_args, expected)
+ def testArtifacts(self):
+ with TemporaryDirectory() as tmp_dir:
+ output_dir = os.path.join(tmp_dir, 'foo')
+ result = gtest_parallel_wrapper.ParseArgs(
+ ['exec', '--store-test-artifacts', '--output_dir', output_dir])
+ exp_artifacts_dir = os.path.join(output_dir, 'test_artifacts')
+ exp = self._Expected([
+ '--output_dir=' + output_dir, 'exec', '--',
+ '--test_artifacts_dir=' + exp_artifacts_dir
+ ])
+ self.assertEqual(result.gtest_parallel_args, exp)
+ self.assertEqual(result.output_dir, output_dir)
+ self.assertEqual(result.test_artifacts_dir, exp_artifacts_dir)
- def testArtifacts(self):
- with TemporaryDirectory() as tmp_dir:
- output_dir = os.path.join(tmp_dir, 'foo')
- result = gtest_parallel_wrapper.ParseArgs(
- ['exec', '--store-test-artifacts', '--output_dir', output_dir])
- exp_artifacts_dir = os.path.join(output_dir, 'test_artifacts')
- exp = self._Expected([
- '--output_dir=' + output_dir, 'exec', '--',
- '--test_artifacts_dir=' + exp_artifacts_dir
- ])
- self.assertEqual(result.gtest_parallel_args, exp)
- self.assertEqual(result.output_dir, output_dir)
- self.assertEqual(result.test_artifacts_dir, exp_artifacts_dir)
+ def testNoDirsSpecified(self):
+ result = gtest_parallel_wrapper.ParseArgs(['exec'])
+ self.assertEqual(result.output_dir, None)
+ self.assertEqual(result.test_artifacts_dir, None)
- def testNoDirsSpecified(self):
- result = gtest_parallel_wrapper.ParseArgs(['exec'])
- self.assertEqual(result.output_dir, None)
- self.assertEqual(result.test_artifacts_dir, None)
+ def testOutputDirSpecified(self):
+ result = gtest_parallel_wrapper.ParseArgs(
+ ['exec', '--output_dir', '/tmp/foo'])
+ self.assertEqual(result.output_dir, '/tmp/foo')
+ self.assertEqual(result.test_artifacts_dir, None)
- def testOutputDirSpecified(self):
- result = gtest_parallel_wrapper.ParseArgs(
- ['exec', '--output_dir', '/tmp/foo'])
- self.assertEqual(result.output_dir, '/tmp/foo')
- self.assertEqual(result.test_artifacts_dir, None)
+ def testShortArg(self):
+ result = gtest_parallel_wrapper.ParseArgs(['-d', '/tmp/foo', 'exec'])
+ expected = self._Expected(['--output_dir=/tmp/foo', 'exec'])
+ self.assertEqual(result.gtest_parallel_args, expected)
+ self.assertEqual(result.output_dir, '/tmp/foo')
- def testShortArg(self):
- result = gtest_parallel_wrapper.ParseArgs(['-d', '/tmp/foo', 'exec'])
- expected = self._Expected(['--output_dir=/tmp/foo', 'exec'])
- self.assertEqual(result.gtest_parallel_args, expected)
- self.assertEqual(result.output_dir, '/tmp/foo')
+ def testBoolArg(self):
+ result = gtest_parallel_wrapper.ParseArgs(
+ ['--gtest_also_run_disabled_tests', 'exec'])
+ expected = self._Expected(['--gtest_also_run_disabled_tests', 'exec'])
+ self.assertEqual(result.gtest_parallel_args, expected)
- def testBoolArg(self):
- result = gtest_parallel_wrapper.ParseArgs(
- ['--gtest_also_run_disabled_tests', 'exec'])
- expected = self._Expected(['--gtest_also_run_disabled_tests', 'exec'])
- self.assertEqual(result.gtest_parallel_args, expected)
+ def testNoArgs(self):
+ result = gtest_parallel_wrapper.ParseArgs(['exec'])
+ expected = self._Expected(['exec'])
+ self.assertEqual(result.gtest_parallel_args, expected)
- def testNoArgs(self):
- result = gtest_parallel_wrapper.ParseArgs(['exec'])
- expected = self._Expected(['exec'])
- self.assertEqual(result.gtest_parallel_args, expected)
+ def testDocExample(self):
+ with TemporaryDirectory() as tmp_dir:
+ output_dir = os.path.join(tmp_dir, 'foo')
+ result = gtest_parallel_wrapper.ParseArgs([
+ 'some_test', '--some_flag=some_value', '--another_flag',
+ '--output_dir=' + output_dir, '--store-test-artifacts',
+ '--isolated-script-test-perf-output=SOME_OTHER_DIR',
+ '--foo=bar', '--baz'
+ ])
+ expected_artifacts_dir = os.path.join(output_dir, 'test_artifacts')
+ expected = self._Expected([
+ '--output_dir=' + output_dir, 'some_test', '--',
+ '--test_artifacts_dir=' + expected_artifacts_dir,
+ '--some_flag=some_value', '--another_flag',
+ '--isolated_script_test_perf_output=SOME_OTHER_DIR',
+ '--foo=bar', '--baz'
+ ])
+ self.assertEqual(result.gtest_parallel_args, expected)
- def testDocExample(self):
- with TemporaryDirectory() as tmp_dir:
- output_dir = os.path.join(tmp_dir, 'foo')
- result = gtest_parallel_wrapper.ParseArgs([
- 'some_test', '--some_flag=some_value', '--another_flag',
- '--output_dir=' + output_dir, '--store-test-artifacts',
- '--isolated-script-test-perf-output=SOME_OTHER_DIR', '--foo=bar',
- '--baz'
- ])
- expected_artifacts_dir = os.path.join(output_dir, 'test_artifacts')
- expected = self._Expected([
- '--output_dir=' + output_dir,
- 'some_test', '--', '--test_artifacts_dir=' + expected_artifacts_dir,
- '--some_flag=some_value', '--another_flag',
- '--isolated_script_test_perf_output=SOME_OTHER_DIR', '--foo=bar',
- '--baz'
- ])
- self.assertEqual(result.gtest_parallel_args, expected)
+ def testStandardWorkers(self):
+ """Check integer value is passed as-is."""
+ result = gtest_parallel_wrapper.ParseArgs(['--workers', '17', 'exec'])
+ expected = self._Expected(['--workers=17', 'exec'])
+ self.assertEqual(result.gtest_parallel_args, expected)
- def testStandardWorkers(self):
- """Check integer value is passed as-is."""
- result = gtest_parallel_wrapper.ParseArgs(['--workers', '17', 'exec'])
- expected = self._Expected(['--workers=17', 'exec'])
- self.assertEqual(result.gtest_parallel_args, expected)
+ def testTwoWorkersPerCpuCore(self):
+ result = gtest_parallel_wrapper.ParseArgs(['--workers', '2x', 'exec'])
+ workers = 2 * multiprocessing.cpu_count()
+ expected = self._Expected(['--workers=%s' % workers, 'exec'])
+ self.assertEqual(result.gtest_parallel_args, expected)
- def testTwoWorkersPerCpuCore(self):
- result = gtest_parallel_wrapper.ParseArgs(['--workers', '2x', 'exec'])
- workers = 2 * multiprocessing.cpu_count()
- expected = self._Expected(['--workers=%s' % workers, 'exec'])
- self.assertEqual(result.gtest_parallel_args, expected)
-
- def testUseHalfTheCpuCores(self):
- result = gtest_parallel_wrapper.ParseArgs(['--workers', '0.5x', 'exec'])
- workers = max(multiprocessing.cpu_count() // 2, 1)
- expected = self._Expected(['--workers=%s' % workers, 'exec'])
- self.assertEqual(result.gtest_parallel_args, expected)
+ def testUseHalfTheCpuCores(self):
+ result = gtest_parallel_wrapper.ParseArgs(
+ ['--workers', '0.5x', 'exec'])
+ workers = max(multiprocessing.cpu_count() // 2, 1)
+ expected = self._Expected(['--workers=%s' % workers, 'exec'])
+ self.assertEqual(result.gtest_parallel_args, expected)
if __name__ == '__main__':
- unittest.main()
+ unittest.main()