← 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: Martin Pool
  • Date: 2008-06-18 05:35:02 UTC
  • mto: This revision was merged to the branch mainline in revision 3510.
  • Revision ID: mbp@sourcefrog.net-20080618053502-9ogi5d5tx7w5ybf6
Change stray pdb calls to exceptions

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., 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
 
23
23
from bzrlib.bundle.serializer import write_bundle
24
24
import bzrlib.bzrdir
25
25
import bzrlib.errors as errors
26
 
from bzrlib.symbol_versioning import deprecated_in
27
26
from bzrlib import tests
28
27
from bzrlib.tests.test_transport import TestTransportImplementation
29
 
from bzrlib.tests.test_transport_implementations import transport_test_permutations
 
28
from bzrlib.tests.test_transport_implementations import TransportTestProviderAdapter
30
29
import bzrlib.transport
31
30
from bzrlib.transport.memory import MemoryTransport
32
31
import bzrlib.urlutils
34
33
 
35
34
def load_tests(standard_tests, module, loader):
36
35
    """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
    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
41
 
42
42
 
43
43
def create_bundle_file(test_case):
60
60
    return out, wt
61
61
 
62
62
 
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
63
class TestReadBundleFromURL(TestTransportImplementation):
85
64
    """Test that read_bundle works properly across multiple transports"""
86
65
 
91
70
        out, wt = create_bundle_file(self)
92
71
        if self.get_transport().is_readonly():
93
72
            f = open('test_bundle', 'wb')
94
 
            try:
95
 
                f.write(out.getvalue())
96
 
            finally:
97
 
                f.close()
 
73
            f.write(out.getvalue())
 
74
            f.close()
98
75
        else:
99
76
            self.get_transport().put_file('test_bundle', out)
100
77
            self.log('Put to: %s', self.get_url('test_bundle'))
101
78
        return wt
102
79
 
103
 
    def test_read_mergeable_from_url(self):
 
80
    def test_read_bundle_from_url(self):
104
81
        self._captureVar('BZR_NO_SMART_VFS', None)
105
82
        wt = self.create_test_bundle()
106
83
        if wt is None:
107
84
            return
108
 
        # read_mergeable_from_url will invoke get_transport which may *not*
109
 
        # respect self._transport (i.e. returns a transport that is different
110
 
        # from the one we want to test, so we must inject a correct transport
111
 
        # into possible_transports first.
112
 
        t = self.get_transport('test_bundle')
113
 
        possible_transports = [t]
114
 
        info = bzrlib.bundle.read_mergeable_from_url(
115
 
                    unicode(self.get_url('test_bundle')),
116
 
                    possible_transports=possible_transports)
 
85
        info = bzrlib.bundle.read_bundle_from_url(
 
86
                    unicode(self.get_url('test_bundle')))
117
87
        revision = info.real_revisions[-1]
118
88
        self.assertEqual('commit-1', revision.revision_id)
119
89
 
125
95
        if wt is None:
126
96
            return
127
97
 
128
 
        self.assertRaises(errors.NotABundle,
129
 
            bzrlib.bundle.read_mergeable_from_url,
 
98
        self.assertRaises(errors.NotABundle, 
 
99
            bzrlib.bundle.read_bundle_from_url, 
130
100
            self.get_url('tree'))
131
 
        self.assertRaises(errors.NotABundle,
132
 
            bzrlib.bundle.read_mergeable_from_url,
 
101
        self.assertRaises(errors.NotABundle, 
 
102
            bzrlib.bundle.read_bundle_from_url, 
133
103
            self.get_url('tree/a'))
134
104
 
135
 
    def test_read_mergeable_respects_possible_transports(self):
136
 
        t = self.get_transport('test_bundle')
137
 
        if not isinstance(t, bzrlib.transport.ConnectedTransport):
138
 
            # There is no point testing transport reuse for not connected
139
 
            # transports (the test will fail even).
140
 
            return
 
105
    def test_read_mergeable_populates_possible_transports(self):
141
106
        self._captureVar('BZR_NO_SMART_VFS', None)
142
107
        wt = self.create_test_bundle()
143
108
        if wt is None:
144
109
            return
145
 
        # read_mergeable_from_url will invoke get_transport which may *not*
146
 
        # respect self._transport (i.e. returns a transport that is different
147
 
        # from the one we want to test, so we must inject a correct transport
148
 
        # into possible_transports first.
149
 
        possible_transports = [t]
 
110
        possible_transports = []
150
111
        url = unicode(self.get_url('test_bundle'))
151
112
        info = bzrlib.bundle.read_mergeable_from_url(url,
152
113
            possible_transports=possible_transports)