/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_read_bundle.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

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 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
16
16
 
17
17
"""Test read_bundle works properly across various transports."""
18
18
 
19
 
import breezy.mergeable
20
 
from ..bzr.bundle.serializer import write_bundle
21
 
import breezy.bzr.bzrdir
22
 
from .. import errors
23
 
from ..sixish import (
24
 
    BytesIO,
25
 
    text_type,
26
 
    )
27
 
from .. import tests
28
 
from .test_transport import TestTransportImplementation
29
 
from .per_transport import transport_test_permutations
30
 
import breezy.transport
31
 
import breezy.urlutils
32
 
from .scenarios import load_tests_apply_scenarios
33
 
 
34
 
 
35
 
load_tests = load_tests_apply_scenarios
 
19
import cStringIO
 
20
import os
 
21
 
 
22
import bzrlib.bundle
 
23
from bzrlib.bundle.serializer import write_bundle
 
24
import bzrlib.bzrdir
 
25
import bzrlib.errors as errors
 
26
from bzrlib.symbol_versioning import deprecated_in
 
27
from bzrlib import tests
 
28
from bzrlib.tests.test_transport import TestTransportImplementation
 
29
from bzrlib.tests.per_transport import transport_test_permutations
 
30
import bzrlib.transport
 
31
from bzrlib.transport.memory import MemoryTransport
 
32
import bzrlib.urlutils
 
33
 
 
34
 
 
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, tests.condition_isinstance(TestReadBundleFromURL))
 
39
    return tests.multiply_tests(transport_tests, transport_test_permutations(),
 
40
        remaining_tests)
36
41
 
37
42
 
38
43
def create_bundle_file(test_case):
39
44
    test_case.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
40
45
 
41
 
    format = breezy.bzr.bzrdir.BzrDirFormat.get_default_format()
 
46
    format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
42
47
 
43
48
    bzrdir = format.initialize('tree')
44
49
    repo = bzrdir.create_repository()
45
 
    branch = repo.controldir.create_branch()
46
 
    wt = branch.controldir.create_workingtree()
 
50
    branch = repo.bzrdir.create_branch()
 
51
    wt = branch.bzrdir.create_workingtree()
47
52
 
48
53
    wt.add(['a', 'subdir/'])
49
 
    wt.commit('new project', rev_id=b'commit-1')
 
54
    wt.commit('new project', rev_id='commit-1')
50
55
 
51
 
    out = BytesIO()
52
 
    write_bundle(wt.branch.repository, wt.get_parent_ids()[0], b'null:', out)
 
56
    out = cStringIO.StringIO()
 
57
    rev_ids = write_bundle(wt.branch.repository,
 
58
                           wt.get_parent_ids()[0], 'null:', out)
53
59
    out.seek(0)
54
60
    return out, wt
55
61
 
56
62
 
57
 
class TestReadMergeableBundleFromURL(TestTransportImplementation):
 
63
class TestDeprecations(tests.TestCaseInTempDir):
 
64
 
 
65
    def create_test_bundle(self):
 
66
        out, wt = create_bundle_file(self)
 
67
        f = open('test_bundle', 'wb')
 
68
        try:
 
69
            f.write(out.getvalue())
 
70
        finally:
 
71
            f.close()
 
72
        return wt
 
73
 
 
74
    def test_read_bundle_from_url_deprecated(self):
 
75
        wt = self.create_test_bundle()
 
76
        t = bzrlib.transport.get_transport(self.test_dir)
 
77
        url = t.abspath('test_bundle')
 
78
        self.callDeprecated([deprecated_in((1, 12, 0))
 
79
                             % 'bzrlib.bundle.read_bundle_from_url'],
 
80
                            bzrlib.bundle.read_bundle_from_url,
 
81
                            url)
 
82
 
 
83
 
 
84
class TestReadBundleFromURL(TestTransportImplementation):
58
85
    """Test that read_bundle works properly across multiple transports"""
59
86
 
60
 
    scenarios = transport_test_permutations()
61
 
 
62
87
    def setUp(self):
63
 
        super(TestReadMergeableBundleFromURL, self).setUp()
 
88
        super(TestReadBundleFromURL, self).setUp()
64
89
        self.bundle_name = 'test_bundle'
65
90
        # read_mergeable_from_url will invoke get_transport which may *not*
66
91
        # respect self._transport (i.e. returns a transport that is different
67
92
        # from the one we want to test, so we must inject a correct transport
68
93
        # into possible_transports first).
69
94
        self.possible_transports = [self.get_transport(self.bundle_name)]
70
 
        self.overrideEnv('BRZ_NO_SMART_VFS', None)
71
 
        self.create_test_bundle()
 
95
        self._captureVar('BZR_NO_SMART_VFS', None)
 
96
        wt = self.create_test_bundle()
72
97
 
73
98
    def read_mergeable_from_url(self, url):
74
 
        return breezy.mergeable.read_mergeable_from_url(
 
99
        return bzrlib.bundle.read_mergeable_from_url(
75
100
            url, possible_transports=self.possible_transports)
76
101
 
77
102
    def get_url(self, relpath=''):
78
 
        return breezy.urlutils.join(self._server.get_url(), relpath)
 
103
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
79
104
 
80
105
    def create_test_bundle(self):
81
106
        out, wt = create_bundle_file(self)
88
113
 
89
114
    def test_read_mergeable_from_url(self):
90
115
        info = self.read_mergeable_from_url(
91
 
            text_type(self.get_url(self.bundle_name)))
 
116
            unicode(self.get_url(self.bundle_name)))
92
117
        revision = info.real_revisions[-1]
93
 
        self.assertEqual(b'commit-1', revision.revision_id)
 
118
        self.assertEqual('commit-1', revision.revision_id)
94
119
 
95
120
    def test_read_fail(self):
96
121
        # Trying to read from a directory, or non-bundle file
102
127
 
103
128
    def test_read_mergeable_respects_possible_transports(self):
104
129
        if not isinstance(self.get_transport(self.bundle_name),
105
 
                          breezy.transport.ConnectedTransport):
 
130
                          bzrlib.transport.ConnectedTransport):
106
131
            # There is no point testing transport reuse for not connected
107
132
            # transports (the test will fail even).
108
133
            raise tests.TestSkipped(
109
134
                'Need a ConnectedTransport to test transport reuse')
110
 
        url = text_type(self.get_url(self.bundle_name))
111
 
        self.read_mergeable_from_url(url)
 
135
        url = unicode(self.get_url(self.bundle_name))
 
136
        info = self.read_mergeable_from_url(url)
112
137
        self.assertEqual(1, len(self.possible_transports))