Commit 3897dc8d authored by Ned Deily's avatar Ned Deily

Issue #7108: Fix test_commands to not fail when special attributes ('@'

or '.') appear in 'ls -l' output.
parent 377efde2
...@@ -49,8 +49,12 @@ class CommandTests(unittest.TestCase): ...@@ -49,8 +49,12 @@ class CommandTests(unittest.TestCase):
# drwxr-xr-x 15 Joe User My Group 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 # Note that the first case above has a space in the group name
# while the second one has a space in both names. # 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. pat = r'''d......... # It is a directory.
\+? # It may have ACLs. [.+@]? # It may have special attributes.
\s+\d+ # It has some number of links. \s+\d+ # It has some number of links.
[^/]* # Skip user, group, size, and date. [^/]* # Skip user, group, size, and date.
/\. # and end with the name of the file. /\. # and end with the name of the file.
......
...@@ -315,6 +315,9 @@ Build ...@@ -315,6 +315,9 @@ Build
Tests 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 - Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a
false positive if the last directory in the path is inaccessible. false positive if the last directory in the path is inaccessible.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment