← 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: Canonical.com Patch Queue Manager
  • Date: 2011-05-26 15:20:03 UTC
  • mfrom: (5918.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110526152003-azhnn5k01tjf1hrg
(vila) Release 2.4b3 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.py
1
 
# Copyright (C) 2006 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
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.symbol_versioning import deprecated_in
27
25
from bzrlib import tests
28
26
from bzrlib.tests.test_transport import TestTransportImplementation
29
27
from bzrlib.tests.per_transport import transport_test_permutations
30
28
import bzrlib.transport
31
 
from bzrlib.transport.memory import MemoryTransport
32
29
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)
 
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
31
 
 
32
 
 
33
load_tests = load_tests_apply_scenarios
41
34
 
42
35
 
43
36
def create_bundle_file(test_case):
60
53
    return out, wt
61
54
 
62
55
 
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):
 
56
class TestReadMergeableBundleFromURL(TestTransportImplementation):
85
57
    """Test that read_bundle works properly across multiple transports"""
86
58
 
 
59
    scenarios = transport_test_permutations()
 
60
 
87
61
    def setUp(self):
88
 
        super(TestReadBundleFromURL, self).setUp()
 
62
        super(TestReadMergeableBundleFromURL, self).setUp()
89
63
        self.bundle_name = 'test_bundle'
90
64
        # read_mergeable_from_url will invoke get_transport which may *not*
91
65
        # respect self._transport (i.e. returns a transport that is different
92
66
        # from the one we want to test, so we must inject a correct transport
93
67
        # into possible_transports first).
94
68
        self.possible_transports = [self.get_transport(self.bundle_name)]
95
 
        self._captureVar('BZR_NO_SMART_VFS', None)
 
69
        self.overrideEnv('BZR_NO_SMART_VFS', None)
96
70
        wt = self.create_test_bundle()
97
71
 
98
72
    def read_mergeable_from_url(self, url):