summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2011-04-05 17:16:09 -0700
committerNed Deily <nad@acm.org>2011-04-05 17:16:09 -0700
commit5f511826c2972c0e4f5de68dba285f7472a3b5bd (patch)
tree4d560d6b2da647da79acd5d97f9a5f264671c2a1
parent9f1ffb2ae932f5eef1bcf1317a0e3d8f4bad0e0c (diff)
downloadcpython-git-5f511826c2972c0e4f5de68dba285f7472a3b5bd.tar.gz
Issue #7108: Fix test_commands to not fail when special attributes ('@'
or '.') appear in 'ls -l' output.
-rw-r--r--Lib/test/test_commands.py6
-rw-r--r--Misc/NEWS3
2 files changed, 8 insertions, 1 deletions
diff --git a/Lib/test/test_commands.py b/Lib/test/test_commands.py
index 70cfb58074..066b182860 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 fe4605fafa..f460127bdf 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.