Fix more tests

Author: slozier

src/core/IronPython.Modules/_ctypes_test.cs

@@ -28,7 +28,7 @@ private static string FindRoot() {
             return string.Empty;
         }
 
-        public static string __file__ = Path.Combine(FindRoot(), "Tests", string.Format("_ctypes_test_{0}{1}.pyd", Environment.OSVersion.Platform == PlatformID.Win32NT ? "win" : Environment.OSVersion.Platform == PlatformID.MacOSX ? "macOS" : "linux", Environment.Is64BitProcess ? 64 : 32));
+        public static string __file__ = Path.Combine(FindRoot(), "tests", "suite", string.Format("_ctypes_test_{0}{1}.pyd", Environment.OSVersion.Platform == PlatformID.Win32NT ? "win" : Environment.OSVersion.Platform == PlatformID.MacOSX ? "macOS" : "linux", Environment.Is64BitProcess ? 64 : 32));
     }
 }
 

src/core/IronPython/Lib/iptest/ipunittest.py

@@ -241,9 +241,9 @@ def generate_suite(tests, failing_tests, skip_tests=[]):
 #     ip_root             = path_combine(rowan_root, basePyDir)
 #     external_dir        = path_combine(rowan_root, 'External.LCA_RESTRICTED/Languages/IronPython')
 #     clean_external_dir  = path_combine(rowan_root, 'External.LCA_RESTRICTED/Languages/CPython/27')
-#     public_testdir      = path_combine(ip_root, 'Tests')
-#     compat_testdir      = path_combine(ip_root, 'Tests/compat')
-#     test_inputs_dir     = path_combine(ip_root, 'Tests/Inputs')
+#     public_testdir      = path_combine(ip_root, 'tests/suite')
+#     compat_testdir      = path_combine(ip_root, 'tests/suite/compat')
+#     test_inputs_dir     = path_combine(ip_root, 'tests/suite/Inputs')
 #     script_testdir      = path_combine(ip_root, 'Scripts')
 
 #     math_testdir        = path_combine(external_dir, 'Math')

tests/IronPython.Tests/Cases/IronPythonCases.cs

@@ -19,7 +19,7 @@ public override int Test(TestInfo testcase) {
     internal class IronPythonCaseGenerator : CommonCaseGenerator<IronPythonCases> {
         protected override IEnumerable<TestInfo> GetTests() {
             return GetFilenames(new[] {
-                System.Tuple.Create(category, "Tests"),
+                System.Tuple.Create(category, Path.Combine("tests", "suite")),
                 System.Tuple.Create($"{category}.scripts", Path.Combine("eng", "scripts")),
             })
             .OrderBy(testcase => testcase.Name);

tests/suite/test_dict.py

@@ -956,7 +956,7 @@ def test_cp16519(self):
         self.assertEqual(sys.Dict["1"], "b")
         del sys.Dict
 
-        with path_modifier(os.path.join(source_root(), 'Tests')):
+        with path_modifier(os.path.join(source_root(), 'tests', 'suite')):
             import testpkg1
             testpkg1.Dict = {"1": "c"}
             self.assertEqual(testpkg1.Dict["1"], "c")