← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_read_bundle.py

  • Committer: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.py
23
23
from bzrlib.bundle.serializer import write_bundle
24
24
import bzrlib.bzrdir
25
25
import bzrlib.errors as errors
26
 
from bzrlib import tests
 
26
from bzrlib.tests import TestCaseInTempDir
27
27
from bzrlib.tests.test_transport import TestTransportImplementation
28
 
from bzrlib.tests.test_transport_implementations import TransportTestProviderAdapter
29
28
import bzrlib.transport
30
29
from bzrlib.transport.memory import MemoryTransport
31
30
import bzrlib.urlutils
32
31
 
33
32
 
34
 
def load_tests(standard_tests, module, loader):
35
 
    """Multiply tests for tranport implementations."""
36
 
    result = loader.suiteClass()
37
 
    adapter = TransportTestProviderAdapter()
38
 
    for test in tests.iter_suite_tests(standard_tests):
39
 
        result.addTests(adapter.adapt(test))
40
 
    return result
41
 
 
42
 
 
43
 
def create_bundle_file(test_case):
44
 
    test_case.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
45
 
 
46
 
    format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
47
 
 
48
 
    bzrdir = format.initialize('tree')
49
 
    repo = bzrdir.create_repository()
50
 
    branch = repo.bzrdir.create_branch()
51
 
    wt = branch.bzrdir.create_workingtree()
52
 
 
53
 
    wt.add(['a', 'subdir/'])
54
 
    wt.commit('new project', rev_id='commit-1')
55
 
 
56
 
    out = cStringIO.StringIO()
57
 
    rev_ids = write_bundle(wt.branch.repository,
58
 
                           wt.get_parent_ids()[0], 'null:', out)
59
 
    out.seek(0)
60
 
    return out, wt
61
 
 
62
 
 
63
33
class TestReadBundleFromURL(TestTransportImplementation):
64
34
    """Test that read_bundle works properly across multiple transports"""
65
35
 
67
37
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
68
38
 
69
39
    def create_test_bundle(self):
70
 
        out, wt = create_bundle_file(self)
71
 
        if self.get_transport().is_readonly():
 
40
        # Can't use self.get_transport() because that asserts that 
 
41
        # it is not readonly, so just skip tests where the server is readonly
 
42
        self._transport = self.get_transport()
 
43
        #if isinstance(self._transport, MemoryTransport):
 
44
        #    return None
 
45
        self.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
 
46
 
 
47
        format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
 
48
 
 
49
 
 
50
        bzrdir = format.initialize('tree')
 
51
        repo = bzrdir.create_repository()
 
52
        branch = repo.bzrdir.create_branch()
 
53
        wt = branch.bzrdir.create_workingtree()
 
54
 
 
55
        wt.add(['a', 'subdir/'])
 
56
        wt.commit('new project', rev_id='commit-1')
 
57
 
 
58
        out = cStringIO.StringIO()
 
59
        rev_ids = write_bundle(wt.branch.repository,
 
60
                               wt.get_parent_ids()[0], None, out)
 
61
        out.seek(0)
 
62
        if self._transport.is_readonly():
72
63
            f = open('test_bundle', 'wb')
73
64
            f.write(out.getvalue())
74
65
            f.close()
75
66
        else:
76
 
            self.get_transport().put_file('test_bundle', out)
 
67
            self._transport.put_file('test_bundle', out)
77
68
            self.log('Put to: %s', self.get_url('test_bundle'))
78
69
        return wt
79
70
 
80
71
    def test_read_bundle_from_url(self):
81
 
        self._captureVar('BZR_NO_SMART_VFS', None)
82
72
        wt = self.create_test_bundle()
83
73
        if wt is None:
84
74
            return
 
75
 
85
76
        info = bzrlib.bundle.read_bundle_from_url(
86
77
                    unicode(self.get_url('test_bundle')))
87
 
        revision = info.real_revisions[-1]
88
 
        self.assertEqual('commit-1', revision.revision_id)
 
78
        bundle_tree = info.revision_tree(wt.branch.repository, info.target)
 
79
        self.assertEqual('commit-1', bundle_tree.revision_id)
89
80
 
90
81
    def test_read_fail(self):
91
82
        # Trying to read from a directory, or non-bundle file
92
83
        # should fail with NotABundle
93
 
        self._captureVar('BZR_NO_SMART_VFS', None)
94
84
        wt = self.create_test_bundle()
95
85
        if wt is None:
96
86
            return
101
91
        self.assertRaises(errors.NotABundle, 
102
92
            bzrlib.bundle.read_bundle_from_url, 
103
93
            self.get_url('tree/a'))
104
 
 
105
 
    def test_read_mergeable_populates_possible_transports(self):
106
 
        self._captureVar('BZR_NO_SMART_VFS', None)
107
 
        wt = self.create_test_bundle()
108
 
        if wt is None:
109
 
            return
110
 
        possible_transports = []
111
 
        url = unicode(self.get_url('test_bundle'))
112
 
        info = bzrlib.bundle.read_mergeable_from_url(url,
113
 
            possible_transports=possible_transports)
114
 
        self.assertEqual(1, len(possible_transports))