[Python-checkins] cpython (2.7): Issue #7108: Fix test_commands to not fail when special attributes ('@'

[ned.deily]

http://hg.python.org/cpython/rev/5616cbce0bee
changeset:   69162:5616cbce0bee
branch:      2.7
parent:      69160:7d4dea76c476
user:        Ned Deily <nad at acm.org>
date:        Tue Apr 05 17:16:09 2011 -0700
summary:
  Issue #7108: Fix test_commands to not fail when special attributes ('@'
or '.') appear in 'ls -l' output.

files:
  Lib/test/test_commands.py |  6 +++++-
  Misc/NEWS                 |  3 +++
  2 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_commands.py b/Lib/test/test_commands.py
--- a/Lib/test/test_commands.py
+++ b/Lib/test/test_commands.py
@@ -49,8 +49,12 @@
         #     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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -315,6 +315,9 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython