From: Rob Browning Date: Fri, 1 Nov 2013 23:32:22 +0000 (-0500) Subject: Don't expect an attr error when the metadata has no attr. X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0f23151db138e962c2da39d7da0c00d11fb782f1;p=packages%2Fb%2Fbup.git Don't expect an attr error when the metadata has no attr. When the metadata object has no Linux attr, there won't be an attr related failure, so don't look for it. Thanks to Alexander Barton and Mark J Hewitt for reporting and helping track down the problem. Signed-off-by: Rob Browning --- diff --git a/lib/bup/t/tmetadata.py b/lib/bup/t/tmetadata.py index fa24d39..ea34f29 100644 --- a/lib/bup/t/tmetadata.py +++ b/lib/bup/t/tmetadata.py @@ -222,7 +222,7 @@ def test_apply_to_path_restricted_access(): m.apply_to_path(path) print >> sys.stderr, helpers.saved_errors expected_errors = ['utime: '] - if _linux_attr_supported(tmpdir): + if m.linux_attr and _linux_attr_supported(tmpdir): expected_errors.append('Linux chattr: ') if _linux_xattr_supported(tmpdir): expected_errors.append('xattr.set: ')