X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbup%2Ft%2Ftclient.py;h=2ea4dca0d0f6b23251a0ab3fb2cfdfb8867f7001;hb=3fa656946d28bb8cac061b745e2edc26bc2d56ae;hp=a3553b69a4b0dace317165808415efdfb50570cf;hpb=394b6481819db91742bfdc25e8d5e374c87845ca;p=bup.git diff --git a/lib/bup/t/tclient.py b/lib/bup/t/tclient.py index a3553b6..2ea4dca 100644 --- a/lib/bup/t/tclient.py +++ b/lib/bup/t/tclient.py @@ -1,75 +1,166 @@ -import sys, os, time, random, subprocess -from bup import client, git + +from __future__ import absolute_import +import sys, os, stat, time, random, subprocess, glob + from wvtest import * +from bup import client, git +from bup.helpers import mkdirp +from buptest import no_lingering_errors, test_tempdir + + def randbytes(sz): s = '' for i in xrange(sz): s += chr(random.randrange(0,256)) return s + +top_dir = os.path.realpath('../../..') +bup_exe = top_dir + '/cmd/bup' + s1 = randbytes(10000) s2 = randbytes(10000) +s3 = randbytes(10000) + +IDX_PAT = '/*.idx' + @wvtest def test_server_split_with_indexes(): - os.environ['BUP_MAIN_EXE'] = '../../../bup' - os.environ['BUP_DIR'] = bupdir = 'buptest_tclient.tmp' - subprocess.call(['rm', '-rf', bupdir]) - git.init_repo(bupdir) - lw = git.PackWriter() - c = client.Client(bupdir, create=True) - rw = c.new_packwriter() - - lw.new_blob(s1) - lw.close() - - rw.new_blob(s2) - rw.breakpoint() - rw.new_blob(s1) + with no_lingering_errors(): + with test_tempdir('bup-tclient-') as tmpdir: + os.environ['BUP_MAIN_EXE'] = bup_exe + os.environ['BUP_DIR'] = bupdir = tmpdir + git.init_repo(bupdir) + lw = git.PackWriter() + c = client.Client(bupdir, create=True) + rw = c.new_packwriter() + + lw.new_blob(s1) + lw.close() + + rw.new_blob(s2) + rw.breakpoint() + rw.new_blob(s1) + rw.close() +@wvtest +def test_multiple_suggestions(): + with no_lingering_errors(): + with test_tempdir('bup-tclient-') as tmpdir: + os.environ['BUP_MAIN_EXE'] = bup_exe + os.environ['BUP_DIR'] = bupdir = tmpdir + git.init_repo(bupdir) + + lw = git.PackWriter() + lw.new_blob(s1) + lw.close() + lw = git.PackWriter() + lw.new_blob(s2) + lw.close() + WVPASSEQ(len(glob.glob(git.repo('objects/pack'+IDX_PAT))), 2) + + c = client.Client(bupdir, create=True) + WVPASSEQ(len(glob.glob(c.cachedir+IDX_PAT)), 0) + rw = c.new_packwriter() + s1sha = rw.new_blob(s1) + WVPASS(rw.exists(s1sha)) + s2sha = rw.new_blob(s2) + # This is a little hacky, but ensures that we test the + # code under test + while (len(glob.glob(c.cachedir+IDX_PAT)) < 2 and + not c.conn.has_input()): + pass + rw.new_blob(s2) + WVPASS(rw.objcache.exists(s1sha)) + WVPASS(rw.objcache.exists(s2sha)) + rw.new_blob(s3) + WVPASSEQ(len(glob.glob(c.cachedir+IDX_PAT)), 2) + rw.close() + WVPASSEQ(len(glob.glob(c.cachedir+IDX_PAT)), 3) + + @wvtest def test_dumb_client_server(): - os.environ['BUP_MAIN_EXE'] = '../../../bup' - os.environ['BUP_DIR'] = bupdir = 'buptest_tclient.tmp' - subprocess.call(['rm', '-rf', bupdir]) - git.init_repo(bupdir) - os.mknod(git.repo('bup-dumb-server')) - - lw = git.PackWriter() - lw.new_blob(s1) - lw.close() - - c = client.Client(bupdir, create=True) - rw = c.new_packwriter() - WVPASSEQ(len(os.listdir(c.cachedir)), 1) - rw.new_blob(s1) - WVPASSEQ(len(os.listdir(c.cachedir)), 1) - rw.new_blob(s2) - rw.close() - WVPASSEQ(len(os.listdir(c.cachedir)), 2) + with no_lingering_errors(): + with test_tempdir('bup-tclient-') as tmpdir: + os.environ['BUP_MAIN_EXE'] = bup_exe + os.environ['BUP_DIR'] = bupdir = tmpdir + git.init_repo(bupdir) + open(git.repo('bup-dumb-server'), 'w').close() + + lw = git.PackWriter() + lw.new_blob(s1) + lw.close() + + c = client.Client(bupdir, create=True) + rw = c.new_packwriter() + WVPASSEQ(len(glob.glob(c.cachedir+IDX_PAT)), 1) + rw.new_blob(s1) + WVPASSEQ(len(glob.glob(c.cachedir+IDX_PAT)), 1) + rw.new_blob(s2) + rw.close() + WVPASSEQ(len(glob.glob(c.cachedir+IDX_PAT)), 2) @wvtest def test_midx_refreshing(): - os.environ['BUP_MAIN_EXE'] = bupmain = '../../../bup' - os.environ['BUP_DIR'] = bupdir = 'buptest_tmidx.tmp' - subprocess.call(['rm', '-rf', bupdir]) - git.init_repo(bupdir) - lw = git.PackWriter() - lw.new_blob(s1) - lw.breakpoint() - lw.new_blob(s2) - del lw - pi = git.PackIdxList(bupdir + '/objects/pack') - WVPASSEQ(len(pi.packs), 2) - pi.refresh() - WVPASSEQ(len(pi.packs), 2) - subprocess.call([bupmain, 'midx', '-f']) - pi.refresh() - WVPASSEQ(len(pi.packs), 1) - pi.refresh(skip_midx=True) - WVPASSEQ(len(pi.packs), 2) - pi.refresh(skip_midx=False) - WVPASSEQ(len(pi.packs), 1) + with no_lingering_errors(): + with test_tempdir('bup-tclient-') as tmpdir: + os.environ['BUP_MAIN_EXE'] = bupmain = '../../../bup' + os.environ['BUP_DIR'] = bupdir = tmpdir + git.init_repo(bupdir) + c = client.Client(bupdir, create=True) + rw = c.new_packwriter() + rw.new_blob(s1) + p1base = rw.breakpoint() + p1name = os.path.join(c.cachedir, p1base) + s1sha = rw.new_blob(s1) # should not be written; it's already in p1 + s2sha = rw.new_blob(s2) + p2base = rw.close() + p2name = os.path.join(c.cachedir, p2base) + del rw + + pi = git.PackIdxList(bupdir + '/objects/pack') + WVPASSEQ(len(pi.packs), 2) + pi.refresh() + WVPASSEQ(len(pi.packs), 2) + WVPASSEQ(sorted([os.path.basename(i.name) for i in pi.packs]), + sorted([p1base, p2base])) + + p1 = git.open_idx(p1name) + WVPASS(p1.exists(s1sha)) + p2 = git.open_idx(p2name) + WVFAIL(p2.exists(s1sha)) + WVPASS(p2.exists(s2sha)) + + subprocess.call([bupmain, 'midx', '-f']) + pi.refresh() + WVPASSEQ(len(pi.packs), 1) + pi.refresh(skip_midx=True) + WVPASSEQ(len(pi.packs), 2) + pi.refresh(skip_midx=False) + WVPASSEQ(len(pi.packs), 1) + + +@wvtest +def test_remote_parsing(): + with no_lingering_errors(): + tests = ( + (':/bup', ('file', None, None, '/bup')), + ('file:///bup', ('file', None, None, '/bup')), + ('192.168.1.1:/bup', ('ssh', '192.168.1.1', None, '/bup')), + ('ssh://192.168.1.1:2222/bup', ('ssh', '192.168.1.1', '2222', '/bup')), + ('ssh://[ff:fe::1]:2222/bup', ('ssh', 'ff:fe::1', '2222', '/bup')), + ('bup://foo.com:1950', ('bup', 'foo.com', '1950', None)), + ('bup://foo.com:1950/bup', ('bup', 'foo.com', '1950', '/bup')), + ('bup://[ff:fe::1]/bup', ('bup', 'ff:fe::1', None, '/bup')),) + for remote, values in tests: + WVPASSEQ(client.parse_remote(remote), values) + try: + client.parse_remote('http://asdf.com/bup') + WVFAIL() + except client.ClientError: + WVPASS()