Add python version and arch to the domain test

BadSingleton · BadSingleton · commit ac877c2b4743 · 2021-01-06T11:04:37.000-05:00
... folder names.
diff --git a/src/domain_tests/TestRunner.cs b/src/domain_tests/TestRunner.cs
@@ -952,10 +952,17 @@ public static int Main(string[] args)
                 Console.WriteLine($"-- Looking for domain reload test case {testName}");
                 testCase = Cases.First(c => c.Name == testName);
             }
+            string pyVersion = null;
+            string pyArch = null;
+            if (args.Length == 3)
+            {
+                pyVersion = args[1];
+                pyArch = args[2];
+            }
 
             Console.WriteLine($"-- Running domain reload test case: {testCase.Name}");
 
-            SetupTestFolder(testCase.Name);
+            SetupTestFolder(testCase.Name, pyVersion, pyArch);
 
             CreatePythonModule(testCase);
             {
@@ -993,9 +1000,9 @@ public static int Main(string[] args)
             return 0;
         }
 
-        static void SetupTestFolder(string testCaseName)
+        static void SetupTestFolder(string testCaseName, string pyVersion, string arch)
         {
-            TestPath = Path.Combine(Path.GetTempPath(), $"Python.TestRunner.{testCaseName}");
+            TestPath = Path.Combine(Path.GetTempPath(), $"Python.TestRunner.{testCaseName}-{pyVersion}-{arch}");
             if (Directory.Exists(TestPath))
             {
                 Directory.Delete(TestPath, recursive: true);
diff --git a/src/domain_tests/test_domain_reload.py b/src/domain_tests/test_domain_reload.py
@@ -1,13 +1,20 @@
 import subprocess
 import os
 import platform
+import sys
 
 import pytest
 
 def _run_test(testname):
     dirname = os.path.split(__file__)[0]
     exename = os.path.join(dirname, 'bin', 'Python.DomainReloadTests.exe')
-    args = [exename, testname]
+    pyversion = "py" + platform.python_version()
+    if sys.maxsize > 2 ** 32:
+        arch = "amd64"
+    else:
+        arch = "x86"
+
+    args = [exename, testname, pyversion, arch]
 
     if platform.system() != 'Windows':
         args = ['mono'] + args

Original file line number	Diff line number	Diff line change
`@@ -952,10 +952,17 @@ public static int Main(string[] args)`
`952`	`952`	`Console.WriteLine($"-- Looking for domain reload test case {testName}");`
`953`	`953`	`testCase = Cases.First(c => c.Name == testName);`
`954`	`954`	`}`
	`955`	`+ string pyVersion = null;`
	`956`	`+ string pyArch = null;`
	`957`	`+ if (args.Length == 3)`
	`958`	`+ {`
	`959`	`+ pyVersion = args[1];`
	`960`	`+ pyArch = args[2];`
	`961`	`+ }`
`955`	`962`
`956`	`963`	`Console.WriteLine($"-- Running domain reload test case: {testCase.Name}");`
`957`	`964`
`958`		`- SetupTestFolder(testCase.Name);`
	`965`	`+ SetupTestFolder(testCase.Name, pyVersion, pyArch);`
`959`	`966`
`960`	`967`	`CreatePythonModule(testCase);`
`961`	`968`	`{`
`@@ -993,9 +1000,9 @@ public static int Main(string[] args)`
`993`	`1000`	`return 0;`
`994`	`1001`	`}`
`995`	`1002`
`996`		`- static void SetupTestFolder(string testCaseName)`
	`1003`	`+ static void SetupTestFolder(string testCaseName, string pyVersion, string arch)`
`997`	`1004`	`{`
`998`		`- TestPath = Path.Combine(Path.GetTempPath(), $"Python.TestRunner.{testCaseName}");`
	`1005`	`+ TestPath = Path.Combine(Path.GetTempPath(), $"Python.TestRunner.{testCaseName}-{pyVersion}-{arch}");`
`999`	`1006`	`if (Directory.Exists(TestPath))`
`1000`	`1007`	`{`
`1001`	`1008`	`Directory.Delete(TestPath, recursive: true);`