Update ZenUnitDevOpsPython flake8 command line argument from '-j 61' to '-j {multiprocessing.cpu_count()}'

Author: NeilJustice

ZenUnitDevOpsPython/Python.py

@@ -1,4 +1,5 @@
 import glob
+import multiprocessing
 import os
 import platform
 import sys
@@ -11,6 +12,11 @@ def pylint_file(pythonFilePath: str) -> int:
    pylintExitCode = Process.run_and_get_exit_code(pylintCommand)
    return pylintExitCode
 
+def run_flake8() -> None:
+   cpuCount = multiprocessing.cpu_count()
+   flake8Command = f'flake8 -j {cpuCount} --config=.flake8 --show-source --benchmark'
+   Process.fail_fast_run(flake8Command)
+
 def run_mypy() -> None:
    Process.fail_fast_run('mypy .')
 
@@ -24,10 +30,6 @@ def run_pylint_on_all_files_in_parallel() -> None:
    if not allPylintsSucceeded:
       sys.exit(1)
 
-def run_flake8() -> None:
-   flake8Command = 'flake8 -j 61 --config=.flake8 --show-source --benchmark'
-   Process.fail_fast_run(flake8Command)
-
 def run_all_with_coverage(testsProjectName: str, omitPattern: str) -> None:
    print(f'Running {testsProjectName}/RunAll.py with coverage from', os.getcwd())
    Process.fail_fast_run(f'coverage run --branch {testsProjectName}/RunAll.py')

ZenUnitDevOpsPythonTests/PythonTests.py

@@ -1,4 +1,5 @@
 import glob
+import multiprocessing
 import os
 import platform
 import sys
@@ -9,9 +10,9 @@
 
 testNames = [
 'test_pylint_file_CallsPylintOnAllPythonFilesInCurrentFolderAndSubFolders',
+'test_run_flake8_RunsFlake8WithFlake8Config',
 'test_run_mypy_RunsMypyDot',
 'test_run_pylint_on_all_files_in_parallel_LinuxCallsMapParallelPylintFileWithAllPyFilePaths_WindowsCallsMapSequential',
-'test_run_flake8_RunsFlake8WithFlake8Config',
 'test_run_all_with_coverage_RunsCoverage_RunsReport_RunsHtml_RunsXml_ExitsWithReportExitCode'
 ]
 
@@ -30,6 +31,18 @@ def test_pylint_file_CallsPylintOnAllPythonFilesInCurrentFolderAndSubFolders(sel
       Process.run_and_get_exit_code.assert_called_once_with(PythonTests.ExpectedPylintCommand + pythonFilePath)
       self.assertEqual(pylintExitCode, pylintExitCode)
 
+   @staticmethod
+   @patch('ZenUnitDevOpsPython.Process.fail_fast_run', spec_set=True)
+   @patch('multiprocessing.cpu_count', spec_set=True)
+   def test_run_flake8_RunsFlake8WithFlake8Config(_1, _2):
+      cpuCount = Random.integer()
+      multiprocessing.cpu_count.return_value = cpuCount
+      #
+      Python.run_flake8()
+      #
+      expectedFlake8Command = f'flake8 -j {cpuCount} --config=.flake8 --show-source --benchmark'
+      Process.fail_fast_run.assert_called_once_with(expectedFlake8Command)
+
    @staticmethod
    @patch('ZenUnitDevOpsPython.Process.fail_fast_run', spec_set=True)
    def test_run_mypy_RunsMypyDot(_1):
@@ -72,15 +85,6 @@ def testcase(platformSystem, expectedMapParallel, allPylintsSucceeded, expectSys
       testcase('Windows', False, False, True)
       testcase('windows', True, False, True)
 
-   @staticmethod
-   @patch('ZenUnitDevOpsPython.Process.fail_fast_run', spec_set=True)
-   def test_run_flake8_RunsFlake8WithFlake8Config(_1):
-      #
-      Python.run_flake8()
-      #
-      expectedFlake8Command = 'flake8 -j 61 --config=.flake8 --show-source --benchmark'
-      Process.fail_fast_run.assert_called_once_with(expectedFlake8Command)
-
    def test_run_all_with_coverage_RunsCoverage_RunsReport_RunsHtml_RunsXml_ExitsWithReportExitCode(self):
       @patch('os.getcwd', spec_set=True)
       @patch('ZenUnitDevOpsPython.Process.fail_fast_run', spec_set=True)

ZenUnitDevOpsPythonTests/ZenUnitDevOpsPythonTests.pyproj

@@ -6,7 +6,7 @@
     <ProjectGuid>5be2bd06-b3d6-4e12-9d37-cb82aa0ef9d3</ProjectGuid>
     <ProjectHome>
     </ProjectHome>
-    <StartupFile>RunAll.py</StartupFile>
+    <StartupFile>PythonTests.py</StartupFile>
     <SearchPath>..\</SearchPath>
     <WorkingDirectory>..</WorkingDirectory>
     <OutputPath>.</OutputPath>