← 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: Martin Pool
  • Date: 2007-06-26 08:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 2555.
  • Revision ID: mbp@sourcefrog.net-20070626080236-14ihgomtffc9tezj
Cleanup old variations on run_bzr in the test suite

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
 
118
122
 
119
123
class ExternalBase(TestCaseWithTransport):
120
124
 
121
 
    def runbzr(self, args, retcode=0, backtick=False):
 
125
    @deprecated_method(zero_eighteen)
 
126
    def runbzr(self, args, retcode=0):
122
127
        if isinstance(args, basestring):
123
128
            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)
 
129
        return self.run_bzr_captured(args, retcode=retcode)
128
130
 
129
131
    def check_output(self, output, *args):
130
132
        """Verify that the expected output matches what bzr says.