← 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: 2011-02-07 04:14:29 UTC
  • mfrom: (5535.4.26 fetch-all-tags-309682)
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20110207041429-3kc1blj34rvvxod9
Merge fetch-all-tags-309682.

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
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
34
31
 
69
66
        # from the one we want to test, so we must inject a correct transport
70
67
        # into possible_transports first).
71
68
        self.possible_transports = [self.get_transport(self.bundle_name)]
72
 
        self._captureVar('BZR_NO_SMART_VFS', None)
 
69
        self.overrideEnv('BZR_NO_SMART_VFS', None)
73
70
        wt = self.create_test_bundle()
74
71
 
75
72
    def read_mergeable_from_url(self, url):