Change metadata "owner" to "user" everywhere to match stat(2), tar, etc.

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

diff --git a/lib/bup/t/tmetadata.py b/lib/bup/t/tmetadata.py
index 2d227998533f2cfbed59ecb48587322b5158c9a9..89a440f9341ea6149a14d541c126ac6a13f2ee3f 100644 (file)
--- a/lib/bup/t/tmetadata.py
+++ b/lib/bup/t/tmetadata.py
@@ -127,6 +127,7 @@ def test_from_path_error():
         os.chmod(path, 000)
         metadata.from_path(path, archive_path=path, save_symlinks=True)
         if metadata.get_linux_file_attr:
+            WVPASS(len(helpers.saved_errors) == 1)
             errmsg = _first_err()
             WVPASS(errmsg.startswith('read Linux attr'))
             clear_errors()
@@ -147,6 +148,7 @@ 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: '))
         clear_errors()
@@ -168,12 +170,14 @@ def test_restore_restricted_user_group():
         orig_uid = m.uid
         m.uid = 0;
         m.apply_to_path(path, restore_numeric_ids=True)
+        WVPASS(len(helpers.saved_errors) == 1)
         errmsg = _first_err()
         WVPASS(errmsg.startswith('lchown: '))
         clear_errors()
         m.uid = orig_uid
         m.gid = 0;
         m.apply_to_path(path, restore_numeric_ids=True)
+        WVPASS(len(helpers.saved_errors) == 1)
         errmsg = _first_err()
         WVPASS(errmsg.startswith('lchown: ') or os.stat(path).st_gid == m.gid)
         clear_errors()
@@ -189,8 +193,8 @@ def test_restore_nonexistent_user_group():
         os.mkdir(path)
         m = metadata.from_path(path, archive_path=path, save_symlinks=True)
         WVPASSEQ(m.path, path)
-        junk,m.owner = max([(len(x.pw_name), x.pw_name + 'x')
-                           for x in pwd.getpwall()])
+        junk,m.user = max([(len(x.pw_name), x.pw_name + 'x')
+                           for x in pwd.getpwall()])
         junk,m.group = max([(len(x.gr_name), x.gr_name + 'x')
                             for x in grp.getgrall()])
         WVPASSEQ(m.apply_to_path(path, restore_numeric_ids=True), None)