diff mbox series

[07/13] iotests/297: Split run_linters apart into run_pylint and run_mypy

Message ID 20211004210503.1455391-8-jsnow@redhat.com (mailing list archive)
State New, archived
Headers show
Series python/iotests: Run iotest linters during Python CI | expand

Commit Message

John Snow Oct. 4, 2021, 9:04 p.m. UTC 
Signed-off-by: John Snow <jsnow@redhat.com>

---

Note, this patch really ought to be squashed with the next one, but I am
performing a move known as "Hedging my bets."
It's easier to squash than de-squash :)

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/qemu-iotests/297 | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

Comments

Hanna Czenczek Oct. 13, 2021, 11:18 a.m. UTC | #1 
On 04.10.21 23:04, John Snow wrote:
> Signed-off-by: John Snow <jsnow@redhat.com>
>
> ---
>
> Note, this patch really ought to be squashed with the next one,

Yes, it should be.

> but I am
> performing a move known as "Hedging my bets."
> It's easier to squash than de-squash :)

True.  Still, should be squashed. ;)

> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>   tests/qemu-iotests/297 | 19 ++++++++++++-------
>   1 file changed, 12 insertions(+), 7 deletions(-)

Reviewed-by: Hanna Reitz <hreitz@redhat.com>
diff mbox series

Patch

diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index fcbab0631be..91029dbb34e 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -61,20 +61,19 @@  def get_test_files() -> List[str]:
     return list(filter(is_python_file, check_tests))
 
 
-def run_linters(
+def run_pylint(
     files: List[str],
     env: Optional[Mapping[str, str]] = None,
 ) -> None:
 
-    print('=== pylint ===')
-    sys.stdout.flush()
-
     subprocess.run(('python3', '-m', 'pylint', *files),
                    env=env, check=False)
 
-    print('=== mypy ===')
-    sys.stdout.flush()
 
+def run_mypy(
+    files: List[str],
+    env: Optional[Mapping[str, str]] = None,
+) -> None:
     p = subprocess.run((('python3', '-m', 'mypy', *files),
                        env=env,
                        check=False,
@@ -99,7 +98,13 @@  def main() -> None:
     env = os.environ.copy()
     env['MYPYPATH'] = env['PYTHONPATH']
 
-    run_linters(files, env=env)
+    print('=== pylint ===')
+    sys.stdout.flush()
+    run_pylint(files, env=env)
+
+    print('=== mypy ===')
+    sys.stdout.flush()
+    run_mypy(files, env=env)
 
 
 iotests.script_main(main)