EmbeddedPythonTest adds missing entries to sys.path

tminka · tminka · commit 5db975a4226c · 2020-12-18T20:12:38.000Z
diff --git a/src/embed_tests/TestPythonTests.cs b/src/embed_tests/TestPythonTests.cs
@@ -27,7 +27,6 @@ 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" };
         }
 
@@ -44,18 +43,21 @@ 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'
+            // We could use 'import' below, but importlib gives more helpful error messages than 'import'
             // https://docs.python.org/3/library/importlib.html#importing-a-source-file-directly
+            // Sometimes sys.path does not contain the site-packages directory, so we add it explicitly
+            // Because the Python tests sometimes have relative imports, the module name must be inside the tests package
             PythonEngine.Exec($@"
 import sys
 import os
-fixtures_path = os.path.join(r'{folder}', 'fixtures')
-sys.path.append(fixtures_path)
+libdir = os.path.dirname(sys.modules['os'].__file__)
+sys.path.append(os.path.join(libdir, 'site-packages'))
+sys.path.append(os.path.dirname(r'{folder}'))
+sys.path.append(os.path.join(r'{folder}', 'fixtures'))
 import clr
 clr.AddReference('Python.Test')
-sys.path.append(r'{folder}')
-import utils
-module_name = '{testFile}'
+import tests
+module_name = 'tests.{testFile}'
 file_path = r'{path}'
 import importlib.util
 spec = importlib.util.spec_from_file_location(module_name, file_path)
