← 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

Merge bzr.dev (and fix NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006 by Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Test read_bundle works properly across various transports."""
18
18
 
19
19
import cStringIO
 
20
import os
20
21
 
21
22
import bzrlib.bundle
22
23
from bzrlib.bundle.serializer import write_bundle
23
24
import bzrlib.bzrdir
24
25
import bzrlib.errors as errors
25
 
from bzrlib import tests
 
26
from bzrlib.tests import TestCaseInTempDir
26
27
from bzrlib.tests.test_transport import TestTransportImplementation
27
 
from bzrlib.tests.per_transport import transport_test_permutations
28
28
import bzrlib.transport
 
29
from bzrlib.transport.memory import MemoryTransport
29
30
import bzrlib.urlutils
30
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
31
 
 
32
 
 
33
 
load_tests = load_tests_apply_scenarios
34
 
 
35
 
 
36
 
def create_bundle_file(test_case):
37
 
    test_case.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
38
 
 
39
 
    format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
40
 
 
41
 
    bzrdir = format.initialize('tree')
42
 
    repo = bzrdir.create_repository()
43
 
    branch = repo.bzrdir.create_branch()
44
 
    wt = branch.bzrdir.create_workingtree()
45
 
 
46
 
    wt.add(['a', 'subdir/'])
47
 
    wt.commit('new project', rev_id='commit-1')
48
 
 
49
 
    out = cStringIO.StringIO()
50
 
    rev_ids = write_bundle(wt.branch.repository,
51
 
                           wt.get_parent_ids()[0], 'null:', out)
52
 
    out.seek(0)
53
 
    return out, wt
54
 
 
55
 
 
56
 
class TestReadMergeableBundleFromURL(TestTransportImplementation):
 
31
 
 
32
 
 
33
class TestReadBundleFromURL(TestTransportImplementation):
57
34
    """Test that read_bundle works properly across multiple transports"""
58
35
 
59
 
    scenarios = transport_test_permutations()
60
 
 
61
 
    def setUp(self):
62
 
        super(TestReadMergeableBundleFromURL, self).setUp()
63
 
        self.bundle_name = 'test_bundle'
64
 
        # read_mergeable_from_url will invoke get_transport which may *not*
65
 
        # respect self._transport (i.e. returns a transport that is different
66
 
        # from the one we want to test, so we must inject a correct transport
67
 
        # into possible_transports first).
68
 
        self.possible_transports = [self.get_transport(self.bundle_name)]
69
 
        self.overrideEnv('BZR_NO_SMART_VFS', None)
70
 
        wt = self.create_test_bundle()
71
 
 
72
 
    def read_mergeable_from_url(self, url):
73
 
        return bzrlib.bundle.read_mergeable_from_url(
74
 
            url, possible_transports=self.possible_transports)
75
 
 
76
36
    def get_url(self, relpath=''):
77
37
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
78
38
 
79
39
    def create_test_bundle(self):
80
 
        out, wt = create_bundle_file(self)
81
 
        if self.get_transport().is_readonly():
82
 
            self.build_tree_contents([(self.bundle_name, out.getvalue())])
 
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.last_revision(), None, out)
 
61
        out.seek(0)
 
62
        if self._transport.is_readonly():
 
63
            f = open('test_bundle', 'wb')
 
64
            f.write(out.getvalue())
 
65
            f.close()
83
66
        else:
84
 
            self.get_transport().put_file(self.bundle_name, out)
85
 
            self.log('Put to: %s', self.get_url(self.bundle_name))
 
67
            self._transport.put('test_bundle', out)
 
68
            self.log('Put to: %s', self.get_url('test_bundle'))
86
69
        return wt
87
70
 
88
 
    def test_read_mergeable_from_url(self):
89
 
        info = self.read_mergeable_from_url(
90
 
            unicode(self.get_url(self.bundle_name)))
91
 
        revision = info.real_revisions[-1]
92
 
        self.assertEqual('commit-1', revision.revision_id)
 
71
    def test_read_bundle_from_url(self):
 
72
        wt = self.create_test_bundle()
 
73
        if wt is None:
 
74
            return
 
75
 
 
76
        info = bzrlib.bundle.read_bundle_from_url(
 
77
                    self.get_url('test_bundle'))
 
78
        bundle_tree = info.revision_tree(wt.branch.repository, info.target)
 
79
        self.assertEqual('commit-1', bundle_tree.revision_id)
93
80
 
94
81
    def test_read_fail(self):
95
82
        # Trying to read from a directory, or non-bundle file
96
83
        # should fail with NotABundle
97
 
        self.assertRaises(errors.NotABundle,
98
 
                          self.read_mergeable_from_url, self.get_url('tree'))
99
 
        self.assertRaises(errors.NotABundle,
100
 
                          self.read_mergeable_from_url, self.get_url('tree/a'))
 
84
        wt = self.create_test_bundle()
 
85
        if wt is None:
 
86
            return
101
87
 
102
 
    def test_read_mergeable_respects_possible_transports(self):
103
 
        if not isinstance(self.get_transport(self.bundle_name),
104
 
                          bzrlib.transport.ConnectedTransport):
105
 
            # There is no point testing transport reuse for not connected
106
 
            # transports (the test will fail even).
107
 
            raise tests.TestSkipped(
108
 
                'Need a ConnectedTransport to test transport reuse')
109
 
        url = unicode(self.get_url(self.bundle_name))
110
 
        info = self.read_mergeable_from_url(url)
111
 
        self.assertEqual(1, len(self.possible_transports))
 
88
        self.assertRaises(errors.NotABundle, 
 
89
            bzrlib.bundle.read_bundle_from_url, 
 
90
            self.get_url('tree'))
 
91
        self.assertRaises(errors.NotABundle, 
 
92
            bzrlib.bundle.read_bundle_from_url, 
 
93
            self.get_url('tree/a'))