properly run ourselves twice (#2807)

[etc/vim.git] / tests / test_primer.py

diff --git a/tests/test_primer.py b/tests/test_primer.py
index 8d00d8353a7efeba3f994d86b9edf72a966d8d3f..0a9d2aec495042229c7e93ea011d361ba7f48302 100644 (file)
--- a/tests/test_primer.py
+++ b/tests/test_primer.py
@@ -9,6 +9,7 @@ from io import StringIO
 from os import getpid
 from pathlib import Path
 from platform import system
+from pytest import LogCaptureFixture
 from subprocess import CalledProcessError
 from tempfile import TemporaryDirectory, gettempdir
 from typing import Any, Callable, Iterator, List, Tuple, TypeVar
@@ -20,6 +21,14 @@ from black_primer import cli, lib
 
 
 EXPECTED_ANALYSIS_OUTPUT = """\
+
+Failed projects:
+
+## black:
+ - Returned 69
+ - stdout:
+Black didn't work
+
 -- primer results 📊 --
 
 68 / 69 succeeded (98.55%) ✅
@@ -28,12 +37,7 @@ EXPECTED_ANALYSIS_OUTPUT = """\
  - 0 projects skipped due to Python version
  - 0 skipped due to long checkout
 
-Failed projects:
-
-## black:
- - Returned 69
- - stdout:
-Black didn't work
+Failed projects: black
 
 """
 FAKE_PROJECT_CONFIG = {
@@ -177,7 +181,7 @@ class PrimerLibTests(unittest.TestCase):
         stdout, stderr = loop.run_until_complete(
             lib._gen_check_output([lib.BLACK_BINARY, "--help"])
         )
-        self.assertTrue("The uncompromising code formatter" in stdout.decode("utf8"))
+        self.assertIn("The uncompromising code formatter", stdout.decode("utf8"))
         self.assertEqual(None, stderr)
 
         # TODO: Add a test to see failure works on Windows
@@ -264,18 +268,23 @@ class PrimerCLITests(unittest.TestCase):
         result = runner.invoke(cli.main, ["--help"])
         self.assertEqual(result.exit_code, 0)
 
-    def test_projects(self) -> None:
+
+def test_projects(caplog: LogCaptureFixture) -> None:
+    with event_loop():
+        runner = CliRunner()
+        result = runner.invoke(cli.main, ["--projects=STDIN,asdf"])
+        assert result.exit_code == 0
+        assert "1 / 1 succeeded" in result.output
+        assert "Projects not found: {'asdf'}" in caplog.text
+
+    caplog.clear()
+
+    with event_loop():
         runner = CliRunner()
-        with event_loop():
-            result = runner.invoke(cli.main, ["--projects=tox,asdf"])
-            self.assertEqual(result.exit_code, 0)
-            assert "1 / 1 succeeded" in result.output
-
-        with event_loop():
-            runner = CliRunner()
-            result = runner.invoke(cli.main, ["--projects=tox,attrs"])
-            self.assertEqual(result.exit_code, 0)
-            assert "2 / 2 succeeded" in result.output
+        result = runner.invoke(cli.main, ["--projects=fdsa,STDIN"])
+        assert result.exit_code == 0
+        assert "1 / 1 succeeded" in result.output
+        assert "Projects not found: {'fdsa'}" in caplog.text
 
 
 if __name__ == "__main__":