← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-29 14:40:04 UTC
  • mfrom: (2565 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070629144004-6qwwujm20j1zsi58
nzrge bzr.dev@2565

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
32
32
                          iter_suite_tests,
33
33
                          )
34
34
from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
 
35
from bzrlib.symbol_versioning import (
 
36
    deprecated_method,
 
37
    zero_eighteen,
 
38
    )
35
39
import bzrlib.ui as ui
36
40
 
37
41
 
69
73
                     'bzrlib.tests.blackbox.test_log',
70
74
                     'bzrlib.tests.blackbox.test_logformats',
71
75
                     'bzrlib.tests.blackbox.test_ls',
 
76
                     'bzrlib.tests.blackbox.test_lsprof',
72
77
                     'bzrlib.tests.blackbox.test_merge',
73
78
                     'bzrlib.tests.blackbox.test_merge_directive',
74
79
                     'bzrlib.tests.blackbox.test_missing',
118
123
 
119
124
class ExternalBase(TestCaseWithTransport):
120
125
 
121
 
    def runbzr(self, args, retcode=0, backtick=False):
 
126
    @deprecated_method(zero_eighteen)
 
127
    def runbzr(self, args, retcode=0):
122
128
        if isinstance(args, basestring):
123
129
            args = args.split()
124
 
        if backtick:
125
 
            return self.run_bzr_captured(args, retcode=retcode)[0]
126
 
        else:
127
 
            return self.run_bzr_captured(args, retcode=retcode)
 
130
        return self.run_bzr(args, retcode=retcode)
128
131
 
129
132
    def check_output(self, output, *args):
130
133
        """Verify that the expected output matches what bzr says.
132
135
        The output is supplied first, so that you can supply a variable
133
136
        number of arguments to bzr.
134
137
        """
135
 
        self.assertEquals(self.run_bzr_captured(args)[0], output)
 
138
        self.assertEquals(self.run_bzr(*args)[0], output)