/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/blackbox/__init__.py

  • Committer: Martin
  • Date: 2010-05-25 17:27:52 UTC
  • mfrom: (5254 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5257.
  • Revision ID: gzlist@googlemail.com-20100525172752-amm089xcikv968sw
Merge bzr.dev to unite with similar changes already made

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
23
23
"""
24
24
 
25
25
 
26
 
from bzrlib.tests import TestCaseWithTransport
 
26
from bzrlib import tests
27
27
 
28
28
 
29
29
def load_tests(basic_tests, module, loader):
52
52
                     'bzrlib.tests.blackbox.test_commit',
53
53
                     'bzrlib.tests.blackbox.test_conflicts',
54
54
                     'bzrlib.tests.blackbox.test_debug',
 
55
                     'bzrlib.tests.blackbox.test_deleted',
55
56
                     'bzrlib.tests.blackbox.test_diff',
56
57
                     'bzrlib.tests.blackbox.test_dump_btree',
57
58
                     'bzrlib.tests.blackbox.test_dpush',
71
72
                     'bzrlib.tests.blackbox.test_locale',
72
73
                     'bzrlib.tests.blackbox.test_log',
73
74
                     'bzrlib.tests.blackbox.test_logformats',
 
75
                     'bzrlib.tests.blackbox.test_lookup_revision',
74
76
                     'bzrlib.tests.blackbox.test_ls',
75
77
                     'bzrlib.tests.blackbox.test_lsprof',
76
78
                     'bzrlib.tests.blackbox.test_merge',
95
97
                     'bzrlib.tests.blackbox.test_revno',
96
98
                     'bzrlib.tests.blackbox.test_revision_history',
97
99
                     'bzrlib.tests.blackbox.test_revision_info',
 
100
                     'bzrlib.tests.blackbox.test_rmbranch',
98
101
                     'bzrlib.tests.blackbox.test_selftest',
99
102
                     'bzrlib.tests.blackbox.test_send',
100
103
                     'bzrlib.tests.blackbox.test_serve',
122
125
    return suite
123
126
 
124
127
 
125
 
class ExternalBase(TestCaseWithTransport):
 
128
class ExternalBase(tests.TestCaseWithTransport):
126
129
 
127
130
    def check_output(self, output, *args):
128
131
        """Verify that the expected output matches what bzr says.