← 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: Andrew Bennetts
  • Date: 2010-10-08 08:15:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.py
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
 
23
23
from bzrlib.bundle.serializer import write_bundle
24
24
import bzrlib.bzrdir
25
25
import bzrlib.errors as errors
26
 
from bzrlib.tests import TestCaseInTempDir
 
26
from bzrlib.symbol_versioning import deprecated_in
 
27
from bzrlib import tests
27
28
from bzrlib.tests.test_transport import TestTransportImplementation
 
29
from bzrlib.tests.per_transport import transport_test_permutations
28
30
import bzrlib.transport
29
31
from bzrlib.transport.memory import MemoryTransport
30
32
import bzrlib.urlutils
31
33
 
32
34
 
33
 
class TestReadBundleFromURL(TestTransportImplementation):
 
35
def load_tests(standard_tests, module, loader):
 
36
    """Multiply tests for tranport implementations."""
 
37
    transport_tests, remaining_tests = tests.split_suite_by_condition(
 
38
        standard_tests,
 
39
        tests.condition_isinstance(TestReadMergeableBundleFromURL))
 
40
    return tests.multiply_tests(transport_tests, transport_test_permutations(),
 
41
        remaining_tests)
 
42
 
 
43
 
 
44
def create_bundle_file(test_case):
 
45
    test_case.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
 
46
 
 
47
    format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
 
48
 
 
49
    bzrdir = format.initialize('tree')
 
50
    repo = bzrdir.create_repository()
 
51
    branch = repo.bzrdir.create_branch()
 
52
    wt = branch.bzrdir.create_workingtree()
 
53
 
 
54
    wt.add(['a', 'subdir/'])
 
55
    wt.commit('new project', rev_id='commit-1')
 
56
 
 
57
    out = cStringIO.StringIO()
 
58
    rev_ids = write_bundle(wt.branch.repository,
 
59
                           wt.get_parent_ids()[0], 'null:', out)
 
60
    out.seek(0)
 
61
    return out, wt
 
62
 
 
63
 
 
64
class TestReadMergeableBundleFromURL(TestTransportImplementation):
34
65
    """Test that read_bundle works properly across multiple transports"""
35
66
 
 
67
    def setUp(self):
 
68
        super(TestReadMergeableBundleFromURL, self).setUp()
 
69
        self.bundle_name = 'test_bundle'
 
70
        # read_mergeable_from_url will invoke get_transport which may *not*
 
71
        # respect self._transport (i.e. returns a transport that is different
 
72
        # from the one we want to test, so we must inject a correct transport
 
73
        # into possible_transports first).
 
74
        self.possible_transports = [self.get_transport(self.bundle_name)]
 
75
        self._captureVar('BZR_NO_SMART_VFS', None)
 
76
        wt = self.create_test_bundle()
 
77
 
 
78
    def read_mergeable_from_url(self, url):
 
79
        return bzrlib.bundle.read_mergeable_from_url(
 
80
            url, possible_transports=self.possible_transports)
 
81
 
36
82
    def get_url(self, relpath=''):
37
83
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
38
84
 
39
85
    def create_test_bundle(self):
40
 
        self.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
41
 
 
42
 
        format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
43
 
 
44
 
        bzrdir = format.initialize('tree')
45
 
        repo = bzrdir.create_repository()
46
 
        branch = repo.bzrdir.create_branch()
47
 
        wt = branch.bzrdir.create_workingtree()
48
 
 
49
 
        wt.add(['a', 'subdir/'])
50
 
        wt.commit('new project', rev_id='commit-1')
51
 
 
52
 
        out = cStringIO.StringIO()
53
 
        rev_ids = write_bundle(wt.branch.repository,
54
 
                               wt.get_parent_ids()[0], 'null:', out)
55
 
        out.seek(0)
 
86
        out, wt = create_bundle_file(self)
56
87
        if self.get_transport().is_readonly():
57
 
            f = open('test_bundle', 'wb')
58
 
            f.write(out.getvalue())
59
 
            f.close()
 
88
            self.build_tree_contents([(self.bundle_name, out.getvalue())])
60
89
        else:
61
 
            self.get_transport().put_file('test_bundle', out)
62
 
            self.log('Put to: %s', self.get_url('test_bundle'))
 
90
            self.get_transport().put_file(self.bundle_name, out)
 
91
            self.log('Put to: %s', self.get_url(self.bundle_name))
63
92
        return wt
64
93
 
65
 
    def test_read_bundle_from_url(self):
66
 
        self._captureVar('BZR_NO_SMART_VFS', None)
67
 
        wt = self.create_test_bundle()
68
 
        if wt is None:
69
 
            return
70
 
        info = bzrlib.bundle.read_bundle_from_url(
71
 
                    unicode(self.get_url('test_bundle')))
 
94
    def test_read_mergeable_from_url(self):
 
95
        info = self.read_mergeable_from_url(
 
96
            unicode(self.get_url(self.bundle_name)))
72
97
        revision = info.real_revisions[-1]
73
98
        self.assertEqual('commit-1', revision.revision_id)
74
99
 
75
100
    def test_read_fail(self):
76
101
        # Trying to read from a directory, or non-bundle file
77
102
        # should fail with NotABundle
78
 
        self._captureVar('BZR_NO_SMART_VFS', None)
79
 
        wt = self.create_test_bundle()
80
 
        if wt is None:
81
 
            return
 
103
        self.assertRaises(errors.NotABundle,
 
104
                          self.read_mergeable_from_url, self.get_url('tree'))
 
105
        self.assertRaises(errors.NotABundle,
 
106
                          self.read_mergeable_from_url, self.get_url('tree/a'))
82
107
 
83
 
        self.assertRaises(errors.NotABundle, 
84
 
            bzrlib.bundle.read_bundle_from_url, 
85
 
            self.get_url('tree'))
86
 
        self.assertRaises(errors.NotABundle, 
87
 
            bzrlib.bundle.read_bundle_from_url, 
88
 
            self.get_url('tree/a'))
 
108
    def test_read_mergeable_respects_possible_transports(self):
 
109
        if not isinstance(self.get_transport(self.bundle_name),
 
110
                          bzrlib.transport.ConnectedTransport):
 
111
            # There is no point testing transport reuse for not connected
 
112
            # transports (the test will fail even).
 
113
            raise tests.TestSkipped(
 
114
                'Need a ConnectedTransport to test transport reuse')
 
115
        url = unicode(self.get_url(self.bundle_name))
 
116
        info = self.read_mergeable_from_url(url)
 
117
        self.assertEqual(1, len(self.possible_transports))