Merge pull request #92 from nicoddemus/release-2.3.0

Prepare release 2.3.0

Author: nicoddemus

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 2.2.2 (UNRELEASED)
+# 2.3.0 (2023-01-30)
 
 - New `cpp_harness_collect` configuration option allows users to add prefix arguments to run C++ test executables, allowing to use additional tools like `wine` of `qemu` for a test runners in cross-platform development.
 

src/pytest_cpp/boost.py

@@ -69,7 +69,17 @@ def read_file(name: str) -> str:
             except ValueError:
                 log_xml = os.path.join(temp_dir, "log.xml")
                 report_xml = os.path.join(temp_dir, "report.xml")
-            args = make_cmdline(harness, executable, ["--output_format=XML", f"--log_sink={log_xml}", f"--report_sink={report_xml}"])
+            args = list(
+                make_cmdline(
+                    harness,
+                    executable,
+                    [
+                        "--output_format=XML",
+                        f"--log_sink={log_xml}",
+                        f"--report_sink={report_xml}",
+                    ],
+                )
+            )
             args.extend(test_args)
 
             p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

src/pytest_cpp/catch2.py

@@ -81,7 +81,13 @@ def run_test(
                 xml_filename = os.path.join(os.path.relpath(temp_dir), "cpp-report.xml")
             except ValueError:
                 xml_filename = os.path.join(temp_dir, "cpp-report.xml")
-            args = make_cmdline(harness, executable, [test_id, "--success", "--reporter=xml", f"--out {xml_filename}"])
+            args = list(
+                make_cmdline(
+                    harness,
+                    executable,
+                    [test_id, "--success", "--reporter=xml", f"--out {xml_filename}"],
+                )
+            )
             args.extend(test_args)
 
             try:

src/pytest_cpp/google.py

@@ -89,7 +89,13 @@ def run_test(
                 xml_filename = os.path.join(os.path.relpath(temp_dir), "cpp-report.xml")
             except ValueError:
                 xml_filename = os.path.join(temp_dir, "cpp-report.xml")
-            args = make_cmdline(harness, executable, [f"--gtest_filter={test_id}", f"--gtest_output=xml:{xml_filename}"])
+            args = list(
+                make_cmdline(
+                    harness,
+                    executable,
+                    [f"--gtest_filter={test_id}", f"--gtest_output=xml:{xml_filename}"],
+                )
+            )
             args.extend(test_args)
 
             try:

src/pytest_cpp/helpers.py

@@ -1,6 +1,7 @@
-
 from typing import Sequence
 
 
-def make_cmdline(harness: Sequence[str], executable: str, arg: Sequence[str] = ()) ->Sequence[str]:
+def make_cmdline(
+    harness: Sequence[str], executable: str, arg: Sequence[str] = ()
+) -> Sequence[str]:
     return [*harness, executable, *arg]

src/pytest_cpp/plugin.py

@@ -69,10 +69,7 @@ def pytest_collect_file(
 
     harness_collect = parent.config.getini("cpp_harness_collect")
     for facade_class in FACADES:
-        if facade_class.is_test_suite(
-                str(file_path),
-                harness_collect=harness_collect
-            ):
+        if facade_class.is_test_suite(str(file_path), harness_collect=harness_collect):
             return CppFile.from_parent(
                 path=file_path,
                 parent=parent,
@@ -154,11 +151,11 @@ def from_parent(  # type:ignore[override]
         )
 
     def collect(self) -> Iterator[CppItem]:
-        harness_collect=self.config.getini("cpp_harness_collect")
+        harness_collect = self.config.getini("cpp_harness_collect")
         for test_id in self.facade.list_tests(
-                str(self.fspath),
-                harness_collect=harness_collect,
-            ):
+            str(self.fspath),
+            harness_collect=harness_collect,
+        ):
             yield CppItem.from_parent(
                 parent=self,
                 name=test_id,

tests/test_pytest_cpp.py

@@ -93,17 +93,19 @@ def test_success(facade, name, test_id, exes):
 
 
 def test_cmdline_builder_happy_flow():
-    arg_string = make_cmdline( ["wine"], "gtest", ["--help"] )
+    arg_string = make_cmdline(["wine"], "gtest", ["--help"])
     assert arg_string == ["wine", "gtest", "--help"]
 
 
 def test_cmdline_builder_with_empty_harness():
-    arg_string = make_cmdline(list(), "boost_test", ["--output_format=XML", "--log_sink=dummy.log"])
+    arg_string = make_cmdline(
+        list(), "boost_test", ["--output_format=XML", "--log_sink=dummy.log"]
+    )
     assert arg_string == ["boost_test", "--output_format=XML", "--log_sink=dummy.log"]
 
 
 def test_cmdline_builder_with_empty_args():
-    arg_string = make_cmdline( ["wine"], "gtest")
+    arg_string = make_cmdline(["wine"], "gtest")
     assert arg_string == ["wine", "gtest"]