fix

Author: ggqlq

Lib/test/test_site.py

@@ -15,7 +15,6 @@
 from test.support.os_helper import TESTFN, EnvironmentVarGuard
 import ast
 import builtins
-import fnmatch
 import glob
 import io
 import os
@@ -806,35 +805,23 @@ def test_underpth_dll_file(self):
             )], env=env)
         self.assertTrue(rc, "sys.path is incorrect")
 
-
 class CommandLineTests(unittest.TestCase):
-    def get_sys_path(self):
-        proc = subprocess.Popen([sys.executable, '-c',
-                                 'import sys; print(repr(sys.path))'],
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.STDOUT,
-                                 text=True)
-        proc.wait()
-        ls = ast.literal_eval(proc.stdout.read())
-        ls[0] = '*'
-        proc.stdout.close()
-        return ls
+    def exists(self, path):
+        if path is not None and os.path.isdir(path):
+            return "exists"
+        else:
+            return "doesn't exist"
 
     def get_excepted_output(self, *args):
         if len(args) == 0:
             user_base = site.getuserbase()
             user_site = site.getusersitepackages()
             output = "sys.path = [\n"
-            for dir in self.get_sys_path():
+            for dir in sys.path:
                 output += "    %r,\n" % (dir,)
             output += "]\n"
-            def exists(path):
-                if path is not None and os.path.isdir(path):
-                    return "exists"
-                else:
-                    return "doesn't exist"
-            output += f"USER_BASE: {user_base!r} ({exists(user_base)})\n"
-            output += f"USER_SITE: {user_site!r} ({exists(user_site)})\n"
+            output += f"USER_BASE: {user_base!r} ({self.exists(user_base)})\n"
+            output += f"USER_SITE: {user_site!r} ({self.exists(user_site)})\n"
             output += f"ENABLE_USER_SITE: {site.ENABLE_USER_SITE!r}\n"
             return 0, dedent(output).strip()
 
@@ -874,30 +861,40 @@ def test_no_args(self):
         excepted_return_code, excepted_output = self.get_excepted_output()
         self.assertEqual(return_code, excepted_return_code)
         # self.assertEqual(output, excepted_output)
-        #print(output)
-        #print(excepted_output)
-        #self.assertTrue(fnmatch.fnmatch(output, excepted_output))
-
+        output_lines = output.splitlines()
+        self.assertEqual(output_lines[-1],
+                         f'ENABLE_USER_SITE: {site.ENABLE_USER_SITE}')
+        user_site = f"USER_SITE: '{site.getusersitepackages()}' ({self.exists(site.getusersitepackages())})"
+        self.assertEqual(output_lines[-2], user_site)
+        user_base = f"USER_BASE: '{site.getuserbase()}' ({self.exists(site.getuserbase())})"
+        self.assertEqual(output_lines[-3], user_base)
+        self.assertEqual(output_lines[0], "sys.path = [")
+        self.assertEqual(output_lines[-4], "]")
+
+    @unittest.skipIf(sys.platform == 'wasi', 'subprocess not supported on WASI')
     def test_unknown_args(self):
         return_code, output = self.invoke_command_line("--unknown-arg")
         excepted_return_code, _ = self.get_excepted_output("--unknown-arg")
         self.assertEqual(return_code, excepted_return_code)
         self.assertIn('[--user-base] [--user-site]', output)
 
+    @unittest.skipIf(sys.platform == 'wasi', 'subprocess not supported on WASI')
     def test_base_arg(self):
         return_code, output = self.invoke_command_line("--user-base")
         excepted = self.get_excepted_output("--user-base")
         excepted_return_code, excepted_output = excepted
         self.assertEqual(return_code, excepted_return_code)
         self.assertEqual(output, excepted_output)
 
+    @unittest.skipIf(sys.platform == 'wasi', 'subprocess not supported on WASI')
     def test_site_arg(self):
         return_code, output = self.invoke_command_line("--user-site")
         excepted = self.get_excepted_output("--user-site")
         excepted_return_code, excepted_output = excepted
         self.assertEqual(return_code, excepted_return_code)
         self.assertEqual(output, excepted_output)
 
+    @unittest.skipIf(sys.platform == 'wasi', 'subprocess not supported on WASI')
     def test_both_args(self):
         return_code, output = self.invoke_command_line("--user-base",
                                                        "--user-site")