← 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: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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.test_transport_implementations import TransportTestProviderAdapter
 
29
from bzrlib.tests.test_transport_implementations import transport_test_permutations
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()
38
37
    transport_tests, remaining_tests = tests.split_suite_by_condition(
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
 
38
        standard_tests, tests.condition_isinstance(TestReadBundleFromURL))
 
39
    return tests.multiply_tests(transport_tests, transport_test_permutations(),
 
40
        remaining_tests)
48
41
 
49
42
 
50
43
def create_bundle_file(test_case):
72
65
    def create_test_bundle(self):
73
66
        out, wt = create_bundle_file(self)
74
67
        f = open('test_bundle', 'wb')
75
 
        f.write(out.getvalue())
76
 
        f.close()
 
68
        try:
 
69
            f.write(out.getvalue())
 
70
        finally:
 
71
            f.close()
77
72
        return wt
78
73
 
79
74
    def test_read_bundle_from_url_deprecated(self):
96
91
        out, wt = create_bundle_file(self)
97
92
        if self.get_transport().is_readonly():
98
93
            f = open('test_bundle', 'wb')
99
 
            f.write(out.getvalue())
100
 
            f.close()
 
94
            try:
 
95
                f.write(out.getvalue())
 
96
            finally:
 
97
                f.close()
101
98
        else:
102
99
            self.get_transport().put_file('test_bundle', out)
103
100
            self.log('Put to: %s', self.get_url('test_bundle'))