/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: Gary van der Merwe
  • Date: 2010-05-05 08:18:32 UTC
  • mfrom: (5206 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5211.
  • Revision ID: garyvdm@gmail.com-20100505081832-ar75izyz4z37r425
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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',
123
125
    return suite
124
126
 
125
127
 
126
 
class ExternalBase(TestCaseWithTransport):
 
128
class ExternalBase(tests.TestCaseWithTransport):
127
129
 
128
130
    def check_output(self, output, *args):
129
131
        """Verify that the expected output matches what bzr says.