From: Ned Deily <nad@acm.org>
Date: Wed, 6 Apr 2011 00:16:09 +0000 (-0700)
Subject: Issue #7108: Fix test_commands to not fail when special attributes ('@'
X-Git-Tag: v2.7.2rc1~185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f511826c2972c0e4f5de68dba285f7472a3b5bd;p=thirdparty%2FPython%2Fcpython.git

Issue #7108: Fix test_commands to not fail when special attributes ('@'
or '.') appear in 'ls -l' output.
---

diff --git a/Lib/test/test_commands.py b/Lib/test/test_commands.py
index 70cfb58074da..066b18286045 100644
--- a/Lib/test/test_commands.py
+++ b/Lib/test/test_commands.py
@@ -49,8 +49,12 @@ class CommandTests(unittest.TestCase):
         #     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.
+        # Special attributes supported:
+        #   + = has ACLs
+        #   @ = has Mac OS X extended attributes
+        #   . = has a SELinux security context
         pat = r'''d.........   # It is a directory.
-                  \+?          # It may have ACLs.
+                  [.+@]?       # It may have special attributes.
                   \s+\d+       # It has some number of links.
                   [^/]*        # Skip user, group, size, and date.
                   /\.          # and end with the name of the file.
diff --git a/Misc/NEWS b/Misc/NEWS
index fe4605fafac3..f460127bdff9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -315,6 +315,9 @@ Build
 Tests
 -----
 
+- Issue #7108: Fix test_commands to not fail when special attributes ('@'
+  or '.') appear in 'ls -l' output.
+
 - Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a
   false positive if the last directory in the path is inaccessible.