/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/test_selftest.py

  • Committer: Andrew Bennetts
  • Date: 2008-05-07 22:47:56 UTC
  • mfrom: (3412 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3414.
  • Revision ID: andrew.bennetts@canonical.com-20080507224756-upxgmud0bdo4ysuf
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_selftest.py
34
34
                          TestUIFactory,
35
35
                          TestSkipped,
36
36
                          )
37
 
from bzrlib.symbol_versioning import (
38
 
    zero_eighteen,
39
 
    )
40
37
from bzrlib.tests.blackbox import ExternalBase
41
38
 
42
39
 
274
271
                                      'magic merge'], retcode=3)[1]
275
272
        self.assertContainsRe(err, 'Bad value "magic merge" for option'
276
273
                              ' "merge-type"')
277
 
        self.callDeprecated(['passing varargs to run_bzr_subprocess was'
278
 
                             ' deprecated in version 0.91.'],
279
 
                            self.run_bzr_subprocess,
280
 
                            'arg1', 'arg2', 'arg3', retcode=3)
281
274
 
282
275
    def test_run_bzr_subprocess_env(self):
283
276
        """run_bzr_subprocess can set environment variables in the child only.