+
import errno, glob, grp, pwd, stat, tempfile, subprocess
-import bup.helpers as helpers
-from bup import git, metadata, vfs
-from bup.helpers import clear_errors, detect_fakeroot, is_superuser, realpath
+
from wvtest import *
+
+from bup import git, metadata, vfs
+from bup.helpers import clear_errors, detect_fakeroot, is_superuser, resolve_parent
from bup.xstat import utime, lutime
+from buptest import no_lingering_errors, test_tempdir
+import bup.helpers as helpers
top_dir = '../../..'
+bup_tmp = os.path.realpath('../../../t/tmp')
bup_path = top_dir + '/bup'
start_dir = os.getcwd()
elif rc > 0:
print >> sys.stderr, 'returned exit status', rc
sys.exit(1)
- except OSError, e:
+ except OSError as e:
print >> sys.stderr, 'subprocess call failed:', e
sys.exit(1)
def setup_testfs():
assert(sys.platform.startswith('linux'))
# Set up testfs with user_xattr, etc.
+ if subprocess.call(['modprobe', 'loop']) != 0:
+ return False
subprocess.call(['umount', 'testfs'])
ex('dd', 'if=/dev/zero', 'of=testfs.img', 'bs=1M', 'count=32')
ex('mke2fs', '-F', '-j', '-m', '0', 'testfs.img')
ex('mount', '-o', 'loop,acl,user_xattr', 'testfs.img', 'testfs')
# Hide, so that tests can't create risks.
os.chown('testfs', 0, 0)
- os.chmod('testfs', 0700)
+ os.chmod('testfs', 0o700)
+ return True
def cleanup_testfs():
@wvtest
def test_clean_up_archive_path():
- cleanup = metadata._clean_up_path_for_archive
- WVPASSEQ(cleanup('foo'), 'foo')
- WVPASSEQ(cleanup('/foo'), 'foo')
- WVPASSEQ(cleanup('///foo'), 'foo')
- WVPASSEQ(cleanup('/foo/bar'), 'foo/bar')
- WVPASSEQ(cleanup('foo/./bar'), 'foo/bar')
- WVPASSEQ(cleanup('/foo/./bar'), 'foo/bar')
- WVPASSEQ(cleanup('/foo/./bar/././baz'), 'foo/bar/baz')
- WVPASSEQ(cleanup('/foo/./bar///././baz'), 'foo/bar/baz')
- WVPASSEQ(cleanup('//./foo/./bar///././baz/.///'), 'foo/bar/baz/')
- WVPASSEQ(cleanup('./foo/./.bar'), 'foo/.bar')
- WVPASSEQ(cleanup('./foo/.'), 'foo')
- WVPASSEQ(cleanup('./foo/..'), '.')
- WVPASSEQ(cleanup('//./..//.../..//.'), '.')
- WVPASSEQ(cleanup('//./..//..././/.'), '...')
- WVPASSEQ(cleanup('/////.'), '.')
- WVPASSEQ(cleanup('/../'), '.')
- WVPASSEQ(cleanup(''), '.')
+ with no_lingering_errors():
+ cleanup = metadata._clean_up_path_for_archive
+ WVPASSEQ(cleanup('foo'), 'foo')
+ WVPASSEQ(cleanup('/foo'), 'foo')
+ WVPASSEQ(cleanup('///foo'), 'foo')
+ WVPASSEQ(cleanup('/foo/bar'), 'foo/bar')
+ WVPASSEQ(cleanup('foo/./bar'), 'foo/bar')
+ WVPASSEQ(cleanup('/foo/./bar'), 'foo/bar')
+ WVPASSEQ(cleanup('/foo/./bar/././baz'), 'foo/bar/baz')
+ WVPASSEQ(cleanup('/foo/./bar///././baz'), 'foo/bar/baz')
+ WVPASSEQ(cleanup('//./foo/./bar///././baz/.///'), 'foo/bar/baz/')
+ WVPASSEQ(cleanup('./foo/./.bar'), 'foo/.bar')
+ WVPASSEQ(cleanup('./foo/.'), 'foo')
+ WVPASSEQ(cleanup('./foo/..'), '.')
+ WVPASSEQ(cleanup('//./..//.../..//.'), '.')
+ WVPASSEQ(cleanup('//./..//..././/.'), '...')
+ WVPASSEQ(cleanup('/////.'), '.')
+ WVPASSEQ(cleanup('/../'), '.')
+ WVPASSEQ(cleanup(''), '.')
@wvtest
def test_risky_path():
- risky = metadata._risky_path
- WVPASS(risky('/foo'))
- WVPASS(risky('///foo'))
- WVPASS(risky('/../foo'))
- WVPASS(risky('../foo'))
- WVPASS(risky('foo/..'))
- WVPASS(risky('foo/../'))
- WVPASS(risky('foo/../bar'))
- WVFAIL(risky('foo'))
- WVFAIL(risky('foo/'))
- WVFAIL(risky('foo///'))
- WVFAIL(risky('./foo'))
- WVFAIL(risky('foo/.'))
- WVFAIL(risky('./foo/.'))
- WVFAIL(risky('foo/bar'))
- WVFAIL(risky('foo/./bar'))
+ with no_lingering_errors():
+ risky = metadata._risky_path
+ WVPASS(risky('/foo'))
+ WVPASS(risky('///foo'))
+ WVPASS(risky('/../foo'))
+ WVPASS(risky('../foo'))
+ WVPASS(risky('foo/..'))
+ WVPASS(risky('foo/../'))
+ WVPASS(risky('foo/../bar'))
+ WVFAIL(risky('foo'))
+ WVFAIL(risky('foo/'))
+ WVFAIL(risky('foo///'))
+ WVFAIL(risky('./foo'))
+ WVFAIL(risky('foo/.'))
+ WVFAIL(risky('./foo/.'))
+ WVFAIL(risky('foo/bar'))
+ WVFAIL(risky('foo/./bar'))
@wvtest
def test_clean_up_extract_path():
- cleanup = metadata._clean_up_extract_path
- WVPASSEQ(cleanup('/foo'), 'foo')
- WVPASSEQ(cleanup('///foo'), 'foo')
- WVFAIL(cleanup('/../foo'))
- WVFAIL(cleanup('../foo'))
- WVFAIL(cleanup('foo/..'))
- WVFAIL(cleanup('foo/../'))
- WVFAIL(cleanup('foo/../bar'))
- WVPASSEQ(cleanup('foo'), 'foo')
- WVPASSEQ(cleanup('foo/'), 'foo/')
- WVPASSEQ(cleanup('foo///'), 'foo///')
- WVPASSEQ(cleanup('./foo'), './foo')
- WVPASSEQ(cleanup('foo/.'), 'foo/.')
- WVPASSEQ(cleanup('./foo/.'), './foo/.')
- WVPASSEQ(cleanup('foo/bar'), 'foo/bar')
- WVPASSEQ(cleanup('foo/./bar'), 'foo/./bar')
- WVPASSEQ(cleanup('/'), '.')
- WVPASSEQ(cleanup('./'), './')
- WVPASSEQ(cleanup('///foo/bar'), 'foo/bar')
- WVPASSEQ(cleanup('///foo/bar'), 'foo/bar')
+ with no_lingering_errors():
+ cleanup = metadata._clean_up_extract_path
+ WVPASSEQ(cleanup('/foo'), 'foo')
+ WVPASSEQ(cleanup('///foo'), 'foo')
+ WVFAIL(cleanup('/../foo'))
+ WVFAIL(cleanup('../foo'))
+ WVFAIL(cleanup('foo/..'))
+ WVFAIL(cleanup('foo/../'))
+ WVFAIL(cleanup('foo/../bar'))
+ WVPASSEQ(cleanup('foo'), 'foo')
+ WVPASSEQ(cleanup('foo/'), 'foo/')
+ WVPASSEQ(cleanup('foo///'), 'foo///')
+ WVPASSEQ(cleanup('./foo'), './foo')
+ WVPASSEQ(cleanup('foo/.'), 'foo/.')
+ WVPASSEQ(cleanup('./foo/.'), './foo/.')
+ WVPASSEQ(cleanup('foo/bar'), 'foo/bar')
+ WVPASSEQ(cleanup('foo/./bar'), 'foo/./bar')
+ WVPASSEQ(cleanup('/'), '.')
+ WVPASSEQ(cleanup('./'), './')
+ WVPASSEQ(cleanup('///foo/bar'), 'foo/bar')
+ WVPASSEQ(cleanup('///foo/bar'), 'foo/bar')
@wvtest
def test_metadata_method():
- tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
- try:
+ with no_lingering_errors(), test_tempdir('bup-tmetadata-') as tmpdir:
bup_dir = tmpdir + '/bup'
data_path = tmpdir + '/foo'
os.mkdir(data_path)
ex(bup_path, '-d', bup_dir, 'save', '-tvvn', 'test', data_path)
git.check_repo_or_die(bup_dir)
top = vfs.RefList(None)
- n = top.lresolve('/test/latest' + realpath(data_path))
+ n = top.lresolve('/test/latest' + resolve_parent(data_path))
m = n.metadata()
WVPASS(m.mtime == test_time2)
WVPASS(len(n.subs()) == 2)
elif sub.name == 'symlink':
m = sub.metadata()
WVPASS(m.mtime == 0)
- finally:
- subprocess.call(['rm', '-rf', tmpdir])
def _first_err():
def test_from_path_error():
if is_superuser() or detect_fakeroot():
return
- tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
- try:
+ with no_lingering_errors(), test_tempdir('bup-tmetadata-') as tmpdir:
path = tmpdir + '/foo'
os.mkdir(path)
m = metadata.from_path(path, archive_path=path, save_symlinks=True)
os.chmod(path, 000)
metadata.from_path(path, archive_path=path, save_symlinks=True)
if metadata.get_linux_file_attr:
+ print >> sys.stderr, 'saved_errors:', helpers.saved_errors
WVPASS(len(helpers.saved_errors) == 1)
errmsg = _first_err()
WVPASS(errmsg.startswith('read Linux attr'))
clear_errors()
- finally:
- subprocess.call(['rm', '-rf', tmpdir])
def _linux_attr_supported(path):
return False
try:
metadata.get_linux_file_attr(path)
- except OSError, e:
+ except OSError as e:
if e.errno in (errno.ENOTTY, errno.ENOSYS, errno.EOPNOTSUPP):
return False
else:
return True
-def _linux_xattr_supported(path):
- # NOTE: destructive test (tries to write to path).
- if not metadata.xattr:
- return False
- try:
- xattr.set(path, 'user.bup-test-xattr-support', 'true', nofollow=True)
- except IOError, e:
- if e.errno == errno.EOPNOTSUPP:
- return False
- else:
- raise
- return True
-
-
@wvtest
def test_apply_to_path_restricted_access():
if is_superuser() or detect_fakeroot():
return
if sys.platform.startswith('cygwin'):
return # chmod 000 isn't effective.
- tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
- try:
+ with no_lingering_errors(), test_tempdir('bup-tmetadata-') as tmpdir:
parent = tmpdir + '/foo'
path = parent + '/bar'
os.mkdir(parent)
WVPASSEQ(m.path, path)
os.chmod(parent, 000)
m.apply_to_path(path)
- print >> sys.stderr, helpers.saved_errors
+ print >> sys.stderr, 'saved_errors:', helpers.saved_errors
expected_errors = ['utime: ']
if m.linux_attr and _linux_attr_supported(tmpdir):
expected_errors.append('Linux chattr: ')
- if _linux_xattr_supported(tmpdir):
- expected_errors.append('xattr.set: ')
+ if metadata.xattr and m.linux_xattr:
+ expected_errors.append("xattr.set '")
WVPASS(len(helpers.saved_errors) == len(expected_errors))
for i in xrange(len(expected_errors)):
WVPASS(str(helpers.saved_errors[i]).startswith(expected_errors[i]))
clear_errors()
- finally:
- subprocess.call(['chmod', '-R', 'u+rwX', tmpdir])
- subprocess.call(['rm', '-rf', tmpdir])
@wvtest
def test_restore_over_existing_target():
- tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
- try:
+ with no_lingering_errors(), test_tempdir('bup-tmetadata-') as tmpdir:
path = tmpdir + '/foo'
os.mkdir(path)
dir_m = metadata.from_path(path, archive_path=path, save_symlinks=True)
os.remove(path + '/bar')
os.mkdir(path + '/bar')
WVEXCEPT(Exception, dir_m.create_path, path, create_symlinks=True)
- finally:
- subprocess.call(['rm', '-rf', tmpdir])
from bup.metadata import posix1e
if not is_superuser() or detect_fakeroot():
WVMSG('skipping test -- not superuser')
return
- setup_testfs()
+ if not setup_testfs():
+ WVMSG('unable to load loop module; skipping dependent tests')
+ return
for f in glob.glob('testfs/*'):
ex('rm', '-rf', f)
path = 'testfs/foo'
projects / bup.git / blobdiff