Feb 14, 2021 · Feb 13, 2021 · Feb 14, 2021 · Feb 13, 2021 · Feb 13, 2021 · Feb 14, 2021
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
        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/
diff --git a/pyproject.toml b/pyproject.toml
 [build-system]
 requires = ["setuptools>=42", "wheel", "pycparser"]
 build-backend = "setuptools.build_meta"

 [tool.pytest.ini_options]
 xfail_strict = true
 testpaths = [
    "tests",
 ]
diff --git a/setup.cfg b/setup.cfg
diff --git a/src/testing/Python.Test.csproj b/src/testing/Python.Test.csproj
 <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>
diff --git a/src/tests/conftest.py b/src/tests/conftest.py
diff --git a/src/tests/fixtures/netstandard2.0/.gitkeep b/src/tests/fixtures/netstandard2.0/.gitkeep
diff --git a/src/tests/__init__.py → tests/__init__.py b/src/tests/__init__.py → tests/__init__.py
diff --git a/src/tests/_missing_import.py → tests/_missing_import.py b/src/tests/_missing_import.py → tests/_missing_import.py
diff --git a/tests/conftest.py b/tests/conftest.py
 # -*- 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
diff --git a/src/tests/fixtures/.gitkeep → tests/fixtures/.gitkeep b/src/tests/fixtures/.gitkeep → tests/fixtures/.gitkeep
diff --git a/src/tests/fixtures/argv-fixture.py → tests/fixtures/argv-fixture.py b/src/tests/fixtures/argv-fixture.py → tests/fixtures/argv-fixture.py
diff --git a/src/tests/importtest.py → tests/importtest.py b/src/tests/importtest.py → tests/importtest.py
diff --git a/src/tests/leaktest.py → tests/leaktest.py b/src/tests/leaktest.py → tests/leaktest.py
diff --git a/src/tests/profile.py → tests/profile.py b/src/tests/profile.py → tests/profile.py
diff --git a/src/tests/runtests.py → tests/runtests.py b/src/tests/runtests.py → tests/runtests.py
diff --git a/src/tests/stress.py → tests/stress.py b/src/tests/stress.py → tests/stress.py
diff --git a/src/tests/stresstest.py → tests/stresstest.py b/src/tests/stresstest.py → tests/stresstest.py
diff --git a/src/tests/test_array.py → tests/test_array.py b/src/tests/test_array.py → tests/test_array.py
diff --git a/src/tests/test_callback.py → tests/test_callback.py b/src/tests/test_callback.py → tests/test_callback.py
diff --git a/src/tests/test_class.py → tests/test_class.py b/src/tests/test_class.py → tests/test_class.py
diff --git a/src/tests/test_clrmethod.py → tests/test_clrmethod.py b/src/tests/test_clrmethod.py → tests/test_clrmethod.py
diff --git a/src/tests/test_constructors.py → tests/test_constructors.py b/src/tests/test_constructors.py → tests/test_constructors.py
diff --git a/src/tests/test_conversion.py → tests/test_conversion.py b/src/tests/test_conversion.py → tests/test_conversion.py
diff --git a/src/tests/test_delegate.py → tests/test_delegate.py b/src/tests/test_delegate.py → tests/test_delegate.py
diff --git a/src/tests/test_docstring.py → tests/test_docstring.py b/src/tests/test_docstring.py → tests/test_docstring.py
diff --git a/src/tests/test_engine.py → tests/test_engine.py b/src/tests/test_engine.py → tests/test_engine.py
diff --git a/src/tests/test_enum.py → tests/test_enum.py b/src/tests/test_enum.py → tests/test_enum.py
diff --git a/src/tests/test_event.py → tests/test_event.py b/src/tests/test_event.py → tests/test_event.py
diff --git a/src/tests/test_exceptions.py → tests/test_exceptions.py b/src/tests/test_exceptions.py → tests/test_exceptions.py
diff --git a/src/tests/test_field.py → tests/test_field.py b/src/tests/test_field.py → tests/test_field.py
diff --git a/src/tests/test_generic.py → tests/test_generic.py b/src/tests/test_generic.py → tests/test_generic.py
diff --git a/src/tests/test_import.py → tests/test_import.py b/src/tests/test_import.py → tests/test_import.py
diff --git a/src/tests/test_indexer.py → tests/test_indexer.py b/src/tests/test_indexer.py → tests/test_indexer.py
diff --git a/src/tests/test_interface.py → tests/test_interface.py b/src/tests/test_interface.py → tests/test_interface.py
diff --git a/src/tests/test_method.py → tests/test_method.py b/src/tests/test_method.py → tests/test_method.py
diff --git a/src/tests/test_module.py → tests/test_module.py b/src/tests/test_module.py → tests/test_module.py
diff --git a/src/tests/test_mp_length.py → tests/test_mp_length.py b/src/tests/test_mp_length.py → tests/test_mp_length.py
diff --git a/src/tests/test_property.py → tests/test_property.py b/src/tests/test_property.py → tests/test_property.py
diff --git a/src/tests/test_recursive_types.py → tests/test_recursive_types.py b/src/tests/test_recursive_types.py → tests/test_recursive_types.py
diff --git a/src/tests/test_repr.py → tests/test_repr.py b/src/tests/test_repr.py → tests/test_repr.py
diff --git a/src/tests/test_subclass.py → tests/test_subclass.py b/src/tests/test_subclass.py → tests/test_subclass.py
diff --git a/src/tests/test_sysargv.py → tests/test_sysargv.py b/src/tests/test_sysargv.py → tests/test_sysargv.py
diff --git a/src/tests/test_thread.py → tests/test_thread.py b/src/tests/test_thread.py → tests/test_thread.py
diff --git a/src/tests/tests.pyproj → tests/tests.pyproj b/src/tests/tests.pyproj → tests/tests.pyproj
diff --git a/src/tests/utils.py → tests/utils.py b/src/tests/utils.py → tests/utils.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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/
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -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",
		]
Original file line number	Diff line number	Diff line change
		@@ -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>
Original file line number	Diff line number	Diff line change
		@@ -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