pythonnet
diff --git a/‎.github/workflows/main.yml
Lines changed: 11 additions & 3 deletions b/‎.github/workflows/main.yml
Lines changed: 11 additions & 3 deletions
diff --git a/‎pyproject.toml
Lines changed: 6 additions & 0 deletions b/‎pyproject.toml
Lines changed: 6 additions & 0 deletions
diff --git a/‎setup.cfg
Lines changed: 0 additions & 4 deletions b/‎setup.cfg
Lines changed: 0 additions & 4 deletions
diff --git a/‎src/testing/Python.Test.csproj
Lines changed: 2 additions & 5 deletions b/‎src/testing/Python.Test.csproj
Lines changed: 2 additions & 5 deletions
diff --git a/‎src/tests/conftest.py
Lines changed: 0 additions & 56 deletions b/‎src/tests/conftest.py
Lines changed: 0 additions & 56 deletions
diff --git a/‎src/tests/fixtures/netstandard2.0/.gitkeep b/‎src/tests/fixtures/netstandard2.0/.gitkeep
diff --git a/‎src/tests/__init__.py renamed to ‎tests/__init__.py b/‎src/tests/__init__.py renamed to ‎tests/__init__.py
diff --git a/‎src/tests/_missing_import.py renamed to ‎tests/_missing_import.py b/‎src/tests/_missing_import.py renamed to ‎tests/_missing_import.py
diff --git a/‎tests/conftest.py
Lines changed: 101 additions & 0 deletions b/‎tests/conftest.py
Lines changed: 101 additions & 0 deletions
diff --git a/‎src/tests/fixtures/.gitkeep renamed to ‎tests/fixtures/.gitkeep b/‎src/tests/fixtures/.gitkeep renamed to ‎tests/fixtures/.gitkeep
diff --git a/‎src/tests/fixtures/argv-fixture.py renamed to ‎tests/fixtures/argv-fixture.py b/‎src/tests/fixtures/argv-fixture.py renamed to ‎tests/fixtures/argv-fixture.py
diff --git a/‎src/tests/importtest.py renamed to ‎tests/importtest.py b/‎src/tests/importtest.py renamed to ‎tests/importtest.py
diff --git a/‎src/tests/leaktest.py renamed to ‎tests/leaktest.py b/‎src/tests/leaktest.py renamed to ‎tests/leaktest.py
diff --git a/‎src/tests/profile.py renamed to ‎tests/profile.py b/‎src/tests/profile.py renamed to ‎tests/profile.py
diff --git a/‎src/tests/runtests.py renamed to ‎tests/runtests.py b/‎src/tests/runtests.py renamed to ‎tests/runtests.py
diff --git a/‎src/tests/stress.py renamed to ‎tests/stress.py b/‎src/tests/stress.py renamed to ‎tests/stress.py
diff --git a/‎src/tests/stresstest.py renamed to ‎tests/stresstest.py b/‎src/tests/stresstest.py renamed to ‎tests/stresstest.py
diff --git a/‎src/tests/test_array.py renamed to ‎tests/test_array.py b/‎src/tests/test_array.py renamed to ‎tests/test_array.py
diff --git a/‎src/tests/test_callback.py renamed to ‎tests/test_callback.py b/‎src/tests/test_callback.py renamed to ‎tests/test_callback.py
diff --git a/‎src/tests/test_class.py renamed to ‎tests/test_class.py b/‎src/tests/test_class.py renamed to ‎tests/test_class.py
diff --git a/‎src/tests/test_clrmethod.py renamed to ‎tests/test_clrmethod.py b/‎src/tests/test_clrmethod.py renamed to ‎tests/test_clrmethod.py
diff --git a/‎src/tests/test_constructors.py renamed to ‎tests/test_constructors.py b/‎src/tests/test_constructors.py renamed to ‎tests/test_constructors.py
diff --git a/‎src/tests/test_conversion.py renamed to ‎tests/test_conversion.py b/‎src/tests/test_conversion.py renamed to ‎tests/test_conversion.py
diff --git a/‎src/tests/test_delegate.py renamed to ‎tests/test_delegate.py b/‎src/tests/test_delegate.py renamed to ‎tests/test_delegate.py
diff --git a/‎src/tests/test_docstring.py renamed to ‎tests/test_docstring.py b/‎src/tests/test_docstring.py renamed to ‎tests/test_docstring.py
diff --git a/‎src/tests/test_engine.py renamed to ‎tests/test_engine.py b/‎src/tests/test_engine.py renamed to ‎tests/test_engine.py
diff --git a/‎src/tests/test_enum.py renamed to ‎tests/test_enum.py b/‎src/tests/test_enum.py renamed to ‎tests/test_enum.py
diff --git a/‎src/tests/test_event.py renamed to ‎tests/test_event.py b/‎src/tests/test_event.py renamed to ‎tests/test_event.py
diff --git a/‎src/tests/test_exceptions.py renamed to ‎tests/test_exceptions.py b/‎src/tests/test_exceptions.py renamed to ‎tests/test_exceptions.py
diff --git a/‎src/tests/test_field.py renamed to ‎tests/test_field.py b/‎src/tests/test_field.py renamed to ‎tests/test_field.py
diff --git a/‎src/tests/test_generic.py renamed to ‎tests/test_generic.py b/‎src/tests/test_generic.py renamed to ‎tests/test_generic.py
diff --git a/‎src/tests/test_import.py renamed to ‎tests/test_import.py b/‎src/tests/test_import.py renamed to ‎tests/test_import.py
diff --git a/‎src/tests/test_indexer.py renamed to ‎tests/test_indexer.py b/‎src/tests/test_indexer.py renamed to ‎tests/test_indexer.py
diff --git a/‎src/tests/test_interface.py renamed to ‎tests/test_interface.py b/‎src/tests/test_interface.py renamed to ‎tests/test_interface.py
diff --git a/‎src/tests/test_method.py renamed to ‎tests/test_method.py b/‎src/tests/test_method.py renamed to ‎tests/test_method.py
diff --git a/‎src/tests/test_module.py renamed to ‎tests/test_module.py b/‎src/tests/test_module.py renamed to ‎tests/test_module.py
diff --git a/‎src/tests/test_mp_length.py renamed to ‎tests/test_mp_length.py b/‎src/tests/test_mp_length.py renamed to ‎tests/test_mp_length.py
diff --git a/‎src/tests/test_property.py renamed to ‎tests/test_property.py b/‎src/tests/test_property.py renamed to ‎tests/test_property.py
diff --git a/‎src/tests/test_recursive_types.py renamed to ‎tests/test_recursive_types.py b/‎src/tests/test_recursive_types.py renamed to ‎tests/test_recursive_types.py
diff --git a/‎src/tests/test_repr.py renamed to ‎tests/test_repr.py b/‎src/tests/test_repr.py renamed to ‎tests/test_repr.py
diff --git a/‎src/tests/test_subclass.py renamed to ‎tests/test_subclass.py b/‎src/tests/test_subclass.py renamed to ‎tests/test_subclass.py
diff --git a/‎src/tests/test_sysargv.py renamed to ‎tests/test_sysargv.py b/‎src/tests/test_sysargv.py renamed to ‎tests/test_sysargv.py
diff --git a/‎src/tests/test_thread.py renamed to ‎tests/test_thread.py b/‎src/tests/test_thread.py renamed to ‎tests/test_thread.py
diff --git a/‎src/tests/tests.pyproj renamed to ‎tests/tests.pyproj b/‎src/tests/tests.pyproj renamed to ‎tests/tests.pyproj
diff --git a/‎src/tests/utils.py renamed to ‎tests/utils.py b/‎src/tests/utils.py renamed to ‎tests/utils.py
@@ -55,9 +55,17 @@ jobs:
         if: ${{ matrix.os == 'windows' }}
         run: |
           python -m pythonnet.find_libpython --export | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-  
-      - name: Python Tests
-        run: pytest
+
+      - name: Python Tests (Mono)
+        if: ${{ matrix.os != 'windows' }}
+        run: pytest --runtime mono
+
+      - name: Python Tests (.NET Core)
+        run: pytest --runtime netcore
+
+      - name: Python Tests (.NET Framework)
+        if: ${{ matrix.os == 'windows' }}
+        run: pytest --runtime netfx
 
       - name: Embedding tests
         run: dotnet test --runtime any-${{ matrix.platform }} src/embed_tests/
 
@@ -1,3 +1,9 @@
 [build-system]
 requires = ["setuptools>=42", "wheel", "pycparser"]
 build-backend = "setuptools.build_meta"
+
+[tool.pytest.ini_options]
+xfail_strict = true
+testpaths = [
+    "tests",
+]
@@ -1,14 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\runtime\Python.Runtime.csproj" />
   </ItemGroup>
-
-  <Target Name="AfterBuild">
-    <Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(MSBuildThisFileDirectory)..\tests\fixtures" />
-  </Target>
 </Project>
@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+# TODO: move tests one out of src to project root.
+# TODO: travis has numpy on their workers. Maybe add tests?
+
+"""Helpers for testing."""
+
+import ctypes
+import os
+import sys
+import sysconfig
+from subprocess import check_call
+from tempfile import mkdtemp
+import shutil
+
+import pytest
+
+from pythonnet import set_runtime
+
+# Add path for `Python.Test`
+cwd = os.path.dirname(__file__)
+fixtures_path = os.path.join(cwd, "fixtures")
+sys.path.append(fixtures_path)
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--runtime",
+        action="store",
+        default="default",
+        help="Must be one of default, netcore, netfx and mono"
+    )
+
+def pytest_configure(config):
+    global bin_path
+    runtime_opt = config.getoption("runtime")
+
+    test_proj_path = os.path.join(cwd, "..", "src", "testing")
+
+    if runtime_opt not in ["netcore", "netfx", "mono", "default"]:
+        raise RuntimeError(f"Invalid runtime: {runtime_opt}")
+
+    bin_path = mkdtemp()
+
+    # tmpdir_factory.mktemp(f"pythonnet-{runtime_opt}")
+
+    fw = "net5.0" if runtime_opt == "netcore" else "netstandard2.0"
+
+    check_call(["dotnet", "publish", "-f", fw, "-o", bin_path, test_proj_path])
+
+    sys.path.append(bin_path)
+
+    if runtime_opt == "default":
+        pass
+    elif runtime_opt == "netfx":
+        from clr_loader import get_netfx
+        runtime = get_netfx()
+        set_runtime(runtime)
+    elif runtime_opt == "mono":
+        from clr_loader import get_mono
+        runtime = get_mono()
+        set_runtime(runtime)
+    elif runtime_opt == "netcore":
+        from clr_loader import get_coreclr
+        rt_config_path = os.path.join(bin_path, "Python.Test.runtimeconfig.json")
+        runtime = get_coreclr(rt_config_path)
+        set_runtime(runtime)
+
+    import clr
+    clr.AddReference("Python.Test")
+    clr.AddReference("System")
+    clr.AddReference("System.Collections")
+    clr.AddReference("System.Data")
+    clr.AddReference("System.Xml")
+
+
+def pytest_unconfigure(config):
+    global bin_path
+    shutil.rmtree(bin_path)
+
+def pytest_report_header(config):
+    """Generate extra report headers"""
+    # FIXME: https://github.com/pytest-dev/pytest/issues/2257
+    is_64bits = sys.maxsize > 2**32
+    arch = "x64" if is_64bits else "x86"
+    ucs = ctypes.sizeof(ctypes.c_wchar)
+    libdir = sysconfig.get_config_var("LIBDIR")
+    shared = bool(sysconfig.get_config_var("Py_ENABLE_SHARED"))
+
+    header = ("Arch: {arch}, UCS: {ucs}, LIBDIR: {libdir}, "
+              "Py_ENABLE_SHARED: {shared}".format(**locals()))
+    return header
+
+
+@pytest.fixture()
+def filepath():
+    """Returns full filepath for file in `fixtures` directory."""
+
+    def make_filepath(filename):
+        # http://stackoverflow.com/questions/18011902/parameter-to-a-fixture
+        return os.path.join(fixtures_path, filename)
+
+    return make_filepath