Reference Python.Test explicitly

filmor · filmor · commit f225d58c20a5 · 2021-02-14T15:06:52.000+01:00
diff --git a/src/python_tests_runner/Python.PythonTestsRunner.csproj b/src/python_tests_runner/Python.PythonTestsRunner.csproj
@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\runtime\Python.Runtime.csproj" />
+    <ProjectReference Include="..\testing\Python.Test.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/python_tests_runner/PythonTestRunner.cs b/src/python_tests_runner/PythonTestRunner.cs
@@ -8,6 +8,7 @@
 using NUnit.Framework;
 
 using Python.Runtime;
+using Python.Test;
 
 namespace Python.PythonTestsRunner
 {
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -31,6 +31,12 @@ def pytest_addoption(parser):
 
 def pytest_configure(config):
     global bin_path
+    if "clr" in sys.modules:
+        # Already loaded (e.g. by the C# test runner), skip build
+        import clr
+        clr.AddReference("Python.Test")
+        return
+
     runtime_opt = config.getoption("runtime")
 
     test_proj_path = os.path.join(cwd, "..", "src", "testing")

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using NUnit.Framework;`
`9`	`9`
`10`	`10`	`using Python.Runtime;`
	`11`	`+using Python.Test;`
`11`	`12`
`12`	`13`	`namespace Python.PythonTestsRunner`
`13`	`14`	`{`