← 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: Patch Queue Manager
  • Date: 2013-05-23 10:35:23 UTC
  • mfrom: (6574.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20130523103523-2wt6jmauja1n1vdt
(jameinel) Merge bzr/2.5 into trunk. (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.py
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006-2011 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Test read_bundle works properly across various transports."""
18
18
 
19
19
import cStringIO
20
 
import os
21
20
 
22
21
import bzrlib.bundle
23
22
from bzrlib.bundle.serializer import write_bundle
24
23
import bzrlib.bzrdir
25
24
import bzrlib.errors as errors
26
 
from bzrlib.tests import TestCaseInTempDir
 
25
from bzrlib import tests
 
26
from bzrlib.tests.test_transport import TestTransportImplementation
 
27
from bzrlib.tests.per_transport import transport_test_permutations
27
28
import bzrlib.transport
28
 
from bzrlib.transport.memory import MemoryTransport
29
29
import bzrlib.urlutils
30
 
 
31
 
 
32
 
# jam 20060615 Originally I thought I should use TestCaseWithTransport
33
 
#       but it turns out that doesn't play well with the transport adapter
34
 
class TestReadBundleFromURL(TestCaseInTempDir):
 
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):
35
57
    """Test that read_bundle works properly across multiple transports"""
36
58
 
 
59
    scenarios = transport_test_permutations()
 
60
 
37
61
    def setUp(self):
38
 
        super(TestReadBundleFromURL, self).setUp()
39
 
        self._server = self.transport_server()
40
 
        self._server.setUp()
41
 
        self._transport = None
 
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()
42
71
 
43
 
    def tearDown(self):
44
 
        self._transport = None
45
 
        self._server.tearDown()
46
 
        super(TestReadBundleFromURL, self).tearDown()
47
 
        
48
 
    def get_transport(self):
49
 
        """Return a connected transport to the local directory."""
50
 
        base_url = self._server.get_url()
51
 
        t = bzrlib.transport.get_transport(base_url)
52
 
        if not isinstance(t, self.transport_class):
53
 
            # we want to make sure to construct one particular class, even if
54
 
            # there are several available implementations of this transport;
55
 
            # therefore construct it by hand rather than through the regular
56
 
            # get_transport method
57
 
            t = self.transport_class(base_url)
58
 
        return t
 
72
    def read_mergeable_from_url(self, url):
 
73
        return bzrlib.bundle.read_mergeable_from_url(
 
74
            url, possible_transports=self.possible_transports)
59
75
 
60
76
    def get_url(self, relpath=''):
61
77
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
62
78
 
63
79
    def create_test_bundle(self):
64
 
        # Can't use self.get_transport() because that asserts that 
65
 
        # it is not readonly, so just skip tests where the server is readonly
66
 
        self._transport = self.get_transport()
67
 
        #if isinstance(self._transport, MemoryTransport):
68
 
        #    return None
69
 
        self.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
70
 
 
71
 
        format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
72
 
 
73
 
 
74
 
        bzrdir = format.initialize('tree')
75
 
        repo = bzrdir.create_repository()
76
 
        branch = repo.bzrdir.create_branch()
77
 
        wt = branch.bzrdir.create_workingtree()
78
 
 
79
 
        wt.add(['a', 'subdir/'])
80
 
        wt.commit('new project', rev_id='commit-1')
81
 
 
82
 
        out = cStringIO.StringIO()
83
 
        rev_ids = write_bundle(wt.branch.repository,
84
 
                               wt.last_revision(), None, out)
85
 
        out.seek(0)
86
 
        if self._transport.is_readonly():
87
 
            f = open('test_bundle', 'wb')
88
 
            f.write(out.getvalue())
89
 
            f.close()
 
80
        out, wt = create_bundle_file(self)
 
81
        if self.get_transport().is_readonly():
 
82
            self.build_tree_contents([(self.bundle_name, out.getvalue())])
90
83
        else:
91
 
            self._transport.put('test_bundle', out)
92
 
            self.log('Put to: %s', self.get_url('test_bundle'))
 
84
            self.get_transport().put_file(self.bundle_name, out)
 
85
            self.log('Put to: %s', self.get_url(self.bundle_name))
93
86
        return wt
94
87
 
95
 
    def test_read_bundle_from_url(self):
96
 
        wt = self.create_test_bundle()
97
 
        if wt is None:
98
 
            return
99
 
 
100
 
        info = bzrlib.bundle.read_bundle_from_url(
101
 
                    self.get_url('test_bundle'))
102
 
        bundle_tree = info.revision_tree(wt.branch.repository, info.target)
103
 
        self.assertEqual('commit-1', bundle_tree.revision_id)
 
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)
104
93
 
105
94
    def test_read_fail(self):
106
95
        # Trying to read from a directory, or non-bundle file
107
96
        # should fail with NotABundle
108
 
        wt = self.create_test_bundle()
109
 
        if wt is None:
110
 
            return
 
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'))
111
101
 
112
 
        self.assertRaises(errors.NotABundle, 
113
 
            bzrlib.bundle.read_bundle_from_url, 
114
 
            self.get_url('tree'))
115
 
        self.assertRaises(errors.NotABundle, 
116
 
            bzrlib.bundle.read_bundle_from_url, 
117
 
            self.get_url('tree/a'))
 
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))