Fix domain reload tests and activate them on macOS

filmor · filmor · commit 60db14e470d6 · 2021-02-13T13:36:53.000+01:00
diff --git a/src/domain_tests/test_domain_reload.py b/src/domain_tests/test_domain_reload.py
@@ -4,6 +4,12 @@
 
 import pytest
 
+from pythonnet.find_libpython import find_libpython
+libpython = find_libpython()
+
+pytestmark = pytest.mark.xfail(libpython is None, reason="Can't find suitable libpython")
+
+
 def _run_test(testname):
     dirname = os.path.split(__file__)[0]
     exename = os.path.join(dirname, 'bin', 'Python.DomainReloadTests.exe')
@@ -12,90 +18,73 @@ def _run_test(testname):
     if platform.system() != 'Windows':
         args = ['mono'] + args
 
-    proc = subprocess.Popen(args)
+    env = os.environ.copy()
+    env["PYTHONNET_PYDLL"] = libpython
+
+    proc = subprocess.Popen(args, env=env)
     proc.wait()
 
     assert proc.returncode == 0
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_rename_class():
     _run_test('class_rename')
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_rename_class_member_static_function():
     _run_test('static_member_rename')
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_rename_class_member_function():
     _run_test('member_rename')
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_rename_class_member_field():
     _run_test('field_rename')
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_rename_class_member_property():
     _run_test('property_rename')
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_rename_namespace():
     _run_test('namespace_rename')
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_field_visibility_change():
     _run_test("field_visibility_change")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_method_visibility_change():
     _run_test("method_visibility_change")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_property_visibility_change():
     _run_test("property_visibility_change")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_class_visibility_change():
     _run_test("class_visibility_change")
 
 @pytest.mark.skip(reason='FIXME: Domain reload fails when Python points to a .NET object which points back to Python objects')
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_method_parameters_change():
     _run_test("method_parameters_change")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_method_return_type_change():
     _run_test("method_return_type_change")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_field_type_change():
     _run_test("field_type_change")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 @pytest.mark.xfail(reason="Events not yet serializable")
 def test_rename_event():
     _run_test('event_rename')
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 @pytest.mark.xfail(reason="newly instanced object uses PyType_GenericAlloc")
 def test_construct_removed_class():
     _run_test("construct_removed_class")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_out_to_ref_param():
     _run_test("out_to_ref_param")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_ref_to_out_param():
     _run_test("ref_to_out_param")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_ref_to_in_param():
     _run_test("ref_to_in_param")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_in_to_ref_param():
     _run_test("in_to_ref_param")
 
-@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_nested_type():
     _run_test("nested_type")
