/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: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

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
 
26
26
from bzrlib.symbol_versioning import deprecated_in
27
27
from bzrlib import tests
28
28
from bzrlib.tests.test_transport import TestTransportImplementation
29
 
from bzrlib.tests.per_transport import transport_test_permutations
 
29
from bzrlib.tests.test_transport_implementations import TransportTestProviderAdapter
30
30
import bzrlib.transport
31
31
from bzrlib.transport.memory import MemoryTransport
32
32
import bzrlib.urlutils
34
34
 
35
35
def load_tests(standard_tests, module, loader):
36
36
    """Multiply tests for tranport implementations."""
 
37
    result = loader.suiteClass()
37
38
    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)
 
39
        standard_tests, tests.condition_isinstance((TestReadBundleFromURL)))
 
40
 
 
41
    adapter = TransportTestProviderAdapter()
 
42
    tests.adapt_tests(transport_tests, adapter, result)
 
43
 
 
44
    # No parametrization for the remaining tests
 
45
    result.addTests(remaining_tests)
 
46
 
 
47
    return result
41
48
 
42
49
 
43
50
def create_bundle_file(test_case):
65
72
    def create_test_bundle(self):
66
73
        out, wt = create_bundle_file(self)
67
74
        f = open('test_bundle', 'wb')
68
 
        try:
69
 
            f.write(out.getvalue())
70
 
        finally:
71
 
            f.close()
 
75
        f.write(out.getvalue())
 
76
        f.close()
72
77
        return wt
73
78
 
74
79
    def test_read_bundle_from_url_deprecated(self):
84
89
class TestReadBundleFromURL(TestTransportImplementation):
85
90
    """Test that read_bundle works properly across multiple transports"""
86
91
 
87
 
    def setUp(self):
88
 
        super(TestReadBundleFromURL, self).setUp()
89
 
        self.bundle_name = 'test_bundle'
90
 
        # read_mergeable_from_url will invoke get_transport which may *not*
91
 
        # respect self._transport (i.e. returns a transport that is different
92
 
        # from the one we want to test, so we must inject a correct transport
93
 
        # into possible_transports first).
94
 
        self.possible_transports = [self.get_transport(self.bundle_name)]
95
 
        self._captureVar('BZR_NO_SMART_VFS', None)
96
 
        wt = self.create_test_bundle()
97
 
 
98
 
    def read_mergeable_from_url(self, url):
99
 
        return bzrlib.bundle.read_mergeable_from_url(
100
 
            url, possible_transports=self.possible_transports)
101
 
 
102
92
    def get_url(self, relpath=''):
103
93
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
104
94
 
105
95
    def create_test_bundle(self):
106
96
        out, wt = create_bundle_file(self)
107
97
        if self.get_transport().is_readonly():
108
 
            self.build_tree_contents([(self.bundle_name, out.getvalue())])
 
98
            f = open('test_bundle', 'wb')
 
99
            f.write(out.getvalue())
 
100
            f.close()
109
101
        else:
110
 
            self.get_transport().put_file(self.bundle_name, out)
111
 
            self.log('Put to: %s', self.get_url(self.bundle_name))
 
102
            self.get_transport().put_file('test_bundle', out)
 
103
            self.log('Put to: %s', self.get_url('test_bundle'))
112
104
        return wt
113
105
 
114
106
    def test_read_mergeable_from_url(self):
115
 
        info = self.read_mergeable_from_url(
116
 
            unicode(self.get_url(self.bundle_name)))
 
107
        self._captureVar('BZR_NO_SMART_VFS', None)
 
108
        wt = self.create_test_bundle()
 
109
        if wt is None:
 
110
            return
 
111
        # read_mergeable_from_url will invoke get_transport which may *not*
 
112
        # respect self._transport (i.e. returns a transport that is different
 
113
        # from the one we want to test, so we must inject a correct transport
 
114
        # into possible_transports first.
 
115
        t = self.get_transport('test_bundle')
 
116
        possible_transports = [t]
 
117
        info = bzrlib.bundle.read_mergeable_from_url(
 
118
                    unicode(self.get_url('test_bundle')),
 
119
                    possible_transports=possible_transports)
117
120
        revision = info.real_revisions[-1]
118
121
        self.assertEqual('commit-1', revision.revision_id)
119
122
 
120
123
    def test_read_fail(self):
121
124
        # Trying to read from a directory, or non-bundle file
122
125
        # should fail with NotABundle
123
 
        self.assertRaises(errors.NotABundle,
124
 
                          self.read_mergeable_from_url, self.get_url('tree'))
125
 
        self.assertRaises(errors.NotABundle,
126
 
                          self.read_mergeable_from_url, self.get_url('tree/a'))
 
126
        self._captureVar('BZR_NO_SMART_VFS', None)
 
127
        wt = self.create_test_bundle()
 
128
        if wt is None:
 
129
            return
 
130
 
 
131
        self.assertRaises(errors.NotABundle,
 
132
            bzrlib.bundle.read_mergeable_from_url,
 
133
            self.get_url('tree'))
 
134
        self.assertRaises(errors.NotABundle,
 
135
            bzrlib.bundle.read_mergeable_from_url,
 
136
            self.get_url('tree/a'))
127
137
 
128
138
    def test_read_mergeable_respects_possible_transports(self):
129
 
        if not isinstance(self.get_transport(self.bundle_name),
130
 
                          bzrlib.transport.ConnectedTransport):
 
139
        t = self.get_transport('test_bundle')
 
140
        if not isinstance(t, bzrlib.transport.ConnectedTransport):
131
141
            # There is no point testing transport reuse for not connected
132
142
            # transports (the test will fail even).
133
 
            raise tests.TestSkipped(
134
 
                'Need a ConnectedTransport to test transport reuse')
135
 
        url = unicode(self.get_url(self.bundle_name))
136
 
        info = self.read_mergeable_from_url(url)
137
 
        self.assertEqual(1, len(self.possible_transports))
 
143
            return
 
144
        self._captureVar('BZR_NO_SMART_VFS', None)
 
145
        wt = self.create_test_bundle()
 
146
        if wt is None:
 
147
            return
 
148
        # read_mergeable_from_url will invoke get_transport which may *not*
 
149
        # respect self._transport (i.e. returns a transport that is different
 
150
        # from the one we want to test, so we must inject a correct transport
 
151
        # into possible_transports first.
 
152
        possible_transports = [t]
 
153
        url = unicode(self.get_url('test_bundle'))
 
154
        info = bzrlib.bundle.read_mergeable_from_url(url,
 
155
            possible_transports=possible_transports)
 
156
        self.assertEqual(1, len(possible_transports))