Fix xattr tests and bugs revealed (fully remove set -e from test-meta.sh).

[bup.git] / lib / bup / t / tmetadata.py

diff --git a/lib/bup/t/tmetadata.py b/lib/bup/t/tmetadata.py
index 4e7884a808f167244629b1f10ed19a8bad962012..6f415b89768683a70f755df66a8a7d0e557ace17 100644 (file)
--- a/lib/bup/t/tmetadata.py
+++ b/lib/bup/t/tmetadata.py
@@ -190,9 +190,11 @@ def test_apply_to_path_restricted_access():
         WVPASSEQ(m.path, path)
         os.chmod(tmpdir, 000)
         m.apply_to_path(path)
-        WVPASS(len(helpers.saved_errors) == 1)
-        errmsg = _first_err()
-        WVPASS(errmsg.startswith('utime: '))
+        print >> sys.stderr, helpers.saved_errors
+        WVPASS(len(helpers.saved_errors) == 3)
+        WVPASS(str(helpers.saved_errors[0]).startswith('utime: '))
+        WVPASS(str(helpers.saved_errors[1]).startswith('Linux chattr: '))
+        WVPASS(str(helpers.saved_errors[2]).startswith('xattr.set: '))
         clear_errors()
     finally:
         subprocess.call(['rm', '-rf', tmpdir])