/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: Aaron Bentley
  • Date: 2007-06-28 02:25:37 UTC
  • mfrom: (2557 +trunk)
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: aaron.bentley@utoronto.ca-20070628022537-40re9wj8x04ehl61
Merge bzr.dev

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
 
119
123
 
120
124
class ExternalBase(TestCaseWithTransport):
121
125
 
122
 
    def runbzr(self, args, retcode=0, backtick=False):
 
126
    @deprecated_method(zero_eighteen)
 
127
    def runbzr(self, args, retcode=0):
123
128
        if isinstance(args, basestring):
124
129
            args = args.split()
125
 
        if backtick:
126
 
            return self.run_bzr_captured(args, retcode=retcode)[0]
127
 
        else:
128
 
            return self.run_bzr_captured(args, retcode=retcode)
 
130
        return self.run_bzr(args, retcode=retcode)
129
131
 
130
132
    def check_output(self, output, *args):
131
133
        """Verify that the expected output matches what bzr says.
133
135
        The output is supplied first, so that you can supply a variable
134
136
        number of arguments to bzr.
135
137
        """
136
 
        self.assertEquals(self.run_bzr_captured(args)[0], output)
 
138
        self.assertEquals(self.run_bzr(*args)[0], output)