EmbeddedPythonTest uses importlib

tminka · tminka · commit 6cc44d1e4229 · 2020-12-18T20:18:14.000Z
diff --git a/src/embed_tests/TestPythonTests.cs b/src/embed_tests/TestPythonTests.cs
@@ -27,6 +27,7 @@ public void Dispose()
 
         static IEnumerable<string[]> MyTestCases()
         {
+            yield return new[] { "test_enum", "test_enum_standard_attrs" };
             yield return new[] { "test_generic", "test_missing_generic_type" };
         }
 
@@ -43,11 +44,25 @@ public void EmbeddedPythonTest(string testFile, string testName)
             string path = Path.Combine(folder, testFile + ".py");
             if (!File.Exists(path)) throw new FileNotFoundException("Cannot find test file", path);
 
+            // importlib gives more helpful error messages than 'import'
+            // https://docs.python.org/3/library/importlib.html#importing-a-source-file-directly
             PythonEngine.Exec($@"
 import sys
-sys.path.insert(0, r'{folder}')
-import {testFile}
-{testFile}.{testName}()
+import os
+fixtures_path = os.path.join(r'{folder}', 'fixtures')
+sys.path.append(fixtures_path)
+import clr
+clr.AddReference('Python.Test')
+sys.path.append(r'{folder}')
+import utils
+module_name = '{testFile}'
+file_path = r'{path}'
+import importlib.util
+spec = importlib.util.spec_from_file_location(module_name, file_path)
+module = importlib.util.module_from_spec(spec)
+sys.modules[module_name] = module
+spec.loader.exec_module(module)
+module.{testName}()
 ");
         }
     }
