Re-enable the domain reload tests (#1404) · pythonnet/pythonnet@33d771c

9 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ build-backend = "setuptools.build_meta"`
`5`	`5`	`[tool.pytest.ini_options]`
`6`	`6`	`xfail_strict = true`
`7`	`7`	`testpaths = [`
`8`		`-"tests",`
	`8`	`+"tests"`
`9`	`9`	`]`

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Test", "src\testing\`
`12`	`12`	`EndProject`
`13`	`13`	`Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.PerformanceTests", "src\perf_tests\Python.PerformanceTests.csproj", "{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}"`
`14`	`14`	`EndProject`
`15`		`-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.DomainReloadTests", "src\domain_tests\Python.DomainReloadTests.csproj", "{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}"`
	`15`	`+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.DomainReloadTests", "tests\domain_tests\Python.DomainReloadTests.csproj", "{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}"`
`16`	`16`	`EndProject`
`17`	`17`	`Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Repo", "Repo", "{441A0123-F4C6-4EE4-9AEE-315FD79BE2D5}"`
`18`	`18`	`ProjectSection(SolutionItems) = preProject`

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ def pytest_addoption(parser):`
`29`	`29`	`help="Must be one of default, netcore, netfx and mono"`
`30`	`30`	`)`
`31`	`31`
	`32`	`+collect_ignore = []`
	`33`	`+`
`32`	`34`	`def pytest_configure(config):`
`33`	`35`	`global bin_path`
`34`	`36`	`if "clr" in sys.modules:`
`@@ -73,6 +75,21 @@ def pytest_configure(config):`
`73`	`75`	`import clr`
`74`	`76`	`clr.AddReference("Python.Test")`
`75`	`77`
	`78`	`+soft_mode = False`
	`79`	`+try:`
	`80`	`+os.environ['PYTHONNET_SHUTDOWN_MODE'] == 'Soft'`
	`81`	`+except: pass`
	`82`	`+`
	`83`	`+if config.getoption("--runtime") == "netcore" or soft_mode\`
	`84`	`+ :`
	`85`	`+collect_ignore.append("domain_tests/test_domain_reload.py")`
	`86`	`+else:`
	`87`	`+domain_tests_dir = os.path.join(os.path.dirname(__file__), "domain_tests")`
	`88`	`+bin_path = os.path.join(domain_tests_dir, "bin")`
	`89`	`+check_call(["dotnet", "build", domain_tests_dir, "-o", bin_path])`
	`90`	`+`
	`91`	`+`
	`92`	`+`
`76`	`93`
`77`	`94`	`def pytest_unconfigure(config):`
`78`	`95`	`global bin_path`

File renamed without changes.

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`</ItemGroup>`
`17`	`17`
`18`	`18`	`<ItemGroup>`
`19`		`-<ProjectReference Include="..\runtime\Python.Runtime.csproj" />`
	`19`	`+<ProjectReference Include="..\..\src\runtime\Python.Runtime.csproj" />`
`20`	`20`	`</ItemGroup>`
`21`	`21`
`22`	`22`	`<ItemGroup>`

File renamed without changes.