X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=lib%2Fbup%2Ft%2Ftclient.py;h=afbb09f07564373cd7db54735053d54da7003a4e;hb=3eb23e4243379195f0e5cfff932ad3ec949b4f98;hp=4a409a08423271c99b72e288ca8dac3b0053c23f;hpb=7e7405d32f7f0a1570c8524e936b168adab03661;p=bup.git diff --git a/lib/bup/t/tclient.py b/lib/bup/t/tclient.py index 4a409a0..afbb09f 100644 --- a/lib/bup/t/tclient.py +++ b/lib/bup/t/tclient.py @@ -1,53 +1,160 @@ -import sys, os, time, random, subprocess -from bup import client, git, hashsplit + +from __future__ import absolute_import +import sys, os, stat, time, random, subprocess, glob + from wvtest import * +from bup import client, git, path +from bup.compat import bytes_from_uint, environ, range +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)) + s = b'' + for i in range(sz): + s += bytes_from_uint(random.randrange(0,256)) return s + s1 = randbytes(10000) s2 = randbytes(10000) +s3 = randbytes(10000) + +IDX_PAT = b'/*.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(b'bup-tclient-') as tmpdir: + environ[b'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(b'bup-tclient-') as tmpdir: + environ[b'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(b'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(): + with no_lingering_errors(): + with test_tempdir(b'bup-tclient-') as tmpdir: + environ[b'BUP_DIR'] = bupdir = tmpdir + git.init_repo(bupdir) + open(git.repo(b'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(b'bup-tclient-') as tmpdir: + environ[b'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 + b'/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([path.exe(), b'midx', b'-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 = ( + (b':/bup', (b'file', None, None, b'/bup')), + (b'file:///bup', (b'file', None, None, b'/bup')), + (b'192.168.1.1:/bup', (b'ssh', b'192.168.1.1', None, b'/bup')), + (b'ssh://192.168.1.1:2222/bup', (b'ssh', b'192.168.1.1', b'2222', b'/bup')), + (b'ssh://[ff:fe::1]:2222/bup', (b'ssh', b'ff:fe::1', b'2222', b'/bup')), + (b'bup://foo.com:1950', (b'bup', b'foo.com', b'1950', None)), + (b'bup://foo.com:1950/bup', (b'bup', b'foo.com', b'1950', b'/bup')), + (b'bup://[ff:fe::1]/bup', (b'bup', b'ff:fe::1', None, b'/bup')),) + for remote, values in tests: + WVPASSEQ(client.parse_remote(remote), values) + try: + client.parse_remote(b'http://asdf.com/bup') + WVFAIL() + except client.ClientError: + WVPASS()