Patch #544740: test_commands test fails under Cygwin

Relax regular expression to handle spaces in user and group names.

diff --git a/Lib/test/test_commands.py b/Lib/test/test_commands.py
index 56d4e7c7a22416886d52e4755f2b5cc486118bf9..dfa1977266d795d7594ef1548ced138a7038d80e 100644 (file)
--- a/Lib/test/test_commands.py
+++ b/Lib/test/test_commands.py
@@ -38,13 +38,15 @@ class CommandTests(unittest.TestCase):
 
     def test_getstatus(self):
         # This pattern should match 'ls -ld /.' on any posix
-        # system, however perversely configured.
+        # system, however perversely configured.  Even on systems
+        # (e.g., Cygwin) where user and group names can have spaces:
+        #     drwxr-xr-x   15 Administ Domain U     4096 Aug 12 12:50 /
+        #     drwxr-xr-x   15 Joe User My Group     4096 Aug 12 12:50 /
+        # Note that the first case above has a space in the group name
+        # while the second one has a space in both names.
         pat = r'''d.........   # It is a directory.
                   \s+\d+       # It has some number of links.
-                  \s+\w+\s+\w+ # It has a user and group, which may
-                               #     be named anything.
-                  \s+\d+       # It has a size.
-                  [^/]*        # Skip the date.
+                  [^/]*        # Skip user, group, size, and date.
                   /\.          # and end with the name of the file.
                '''