EmbeddedPythonTest is even smarter about finding tests directory

tminka · tminka · commit f2ceaf6c2679 · 2020-12-18T02:19:12.000Z
diff --git a/src/embed_tests/TestPythonTests.cs b/src/embed_tests/TestPythonTests.cs
@@ -4,7 +4,9 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+
 using NUnit.Framework;
+
 using Python.Runtime;
 
 namespace Python.EmbeddingTest
@@ -32,8 +34,8 @@ static IEnumerable<string[]> MyTestCases()
         public void EmbeddedPythonTest(string testFile, string testName)
         {
             // Find the tests directory
-            string folder = Directory.GetCurrentDirectory();
-            while(Path.GetFileName(folder) != "src")
+            string folder = typeof(TestPythonTests).Assembly.Location;
+            while (Path.GetFileName(folder) != "src")
             {
                 folder = Path.GetDirectoryName(folder);
             }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Reflection;`
`6`	`6`	`using System.Text;`
	`7`	`+`
`7`	`8`	`using NUnit.Framework;`
	`9`	`+`
`8`	`10`	`using Python.Runtime;`
`9`	`11`
`10`	`12`	`namespace Python.EmbeddingTest`
`@@ -32,8 +34,8 @@ static IEnumerable<string[]> MyTestCases()`
`32`	`34`	`public void EmbeddedPythonTest(string testFile, string testName)`
`33`	`35`	`{`
`34`	`36`	`// Find the tests directory`
`35`		`- string folder = Directory.GetCurrentDirectory();`
`36`		`- while(Path.GetFileName(folder) != "src")`
	`37`	`+ string folder = typeof(TestPythonTests).Assembly.Location;`
	`38`	`+ while (Path.GetFileName(folder) != "src")`
`37`	`39`	`{`
`38`	`40`	`folder = Path.GetDirectoryName(folder);`
`39`	`41`	`}`