Fix embedding tests

filmor · filmor · commit 34a1705defab · 2020-09-24T14:59:40.000+02:00
diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj
@@ -8,6 +8,10 @@
     <ProjectReference Include="..\runtime\Python.Runtime.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="fixtures/**/*.py" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.*" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.*">
diff --git a/src/embed_tests/TestDomainReload.cs b/src/embed_tests/TestDomainReload.cs
@@ -118,6 +118,8 @@ static Assembly BuildAssembly(string assemblyName)
 
             var compilerparams = new CompilerParameters();
             compilerparams.ReferencedAssemblies.Add("Python.Runtime.dll");
+            var netstandard = Assembly.Load("netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51");
+            compilerparams.ReferencedAssemblies.Add(netstandard.Location);
             compilerparams.GenerateExecutable = false;
             compilerparams.GenerateInMemory = false;
             compilerparams.IncludeDebugInformation = false;
diff --git a/src/embed_tests/TestPyWith.cs b/src/embed_tests/TestPyWith.cs
@@ -25,15 +25,14 @@ public void Dispose()
         public void TestWithPositive()
         {
             var locals = new PyDict();
-            
+
             PythonEngine.Exec(@"
 class CmTest:
     def __enter__(self):
-        print('Enter')
         return self
     def __exit__(self, t, v, tb):
         # Exception not handled, return will be False
-        print('Exit')
+        pass
     def fail(self):
         return 5 / 0
 
@@ -51,6 +50,7 @@ def fail(self):
             }
             catch (PythonException e)
             {
+                TestContext.Out.WriteLine(e.Message);
                 Assert.IsTrue(e.Message.Contains("ZeroDivisionError"));
             }
         }
diff --git a/src/embed_tests/pyimport.cs b/src/embed_tests/pyimport.cs
@@ -30,12 +30,8 @@ public void SetUp()
             /* Append the tests directory to sys.path
              * using reflection to circumvent the private
              * modifiers placed on most Runtime methods. */
-#if NETCOREAPP
-            const string s = "../../fixtures";
-#else
-            const string s = "../fixtures";
-#endif
-            string testPath = Path.Combine(TestContext.CurrentContext.TestDirectory, s);
+            string testPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "fixtures");
+            TestContext.Out.WriteLine(testPath);
 
             IntPtr str = Runtime.Runtime.PyString_FromString(testPath);
             BorrowedReference path = Runtime.Runtime.PySys_GetObject("path");

Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,14 @@ public void Dispose()`
`25`	`25`	`public void TestWithPositive()`
`26`	`26`	`{`
`27`	`27`	`var locals = new PyDict();`
`28`		`-`
	`28`	`+`
`29`	`29`	`PythonEngine.Exec(@"`
`30`	`30`	`class CmTest:`
`31`	`31`	`def __enter__(self):`
`32`		`- print('Enter')`
`33`	`32`	`return self`
`34`	`33`	`def __exit__(self, t, v, tb):`
`35`	`34`	`# Exception not handled, return will be False`
`36`		`- print('Exit')`
	`35`	`+ pass`
`37`	`36`	`def fail(self):`
`38`	`37`	`return 5 / 0`
`39`	`38`
`@@ -51,6 +50,7 @@ def fail(self):`
`51`	`50`	`}`
`52`	`51`	`catch (PythonException e)`
`53`	`52`	`{`
	`53`	`+ TestContext.Out.WriteLine(e.Message);`
`54`	`54`	`Assert.IsTrue(e.Message.Contains("ZeroDivisionError"));`
`55`	`55`	`}`
`56`	`56`	`}`