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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
898
898
                osutils.set_or_unset_env(env_var, value)
899
899
 
900
900
        bzr_path = os.path.dirname(os.path.dirname(bzrlib.__file__))+'/bzr'
 
901
        if not os.path.isfile(bzr_path):
 
902
            # We are probably installed. Assume sys.argv is the right file
 
903
            bzr_path = sys.argv[0]
901
904
        args = list(args)
902
905
 
903
906
        try:
920
923
        retcode = process.wait()
921
924
        supplied_retcode = kwargs.get('retcode', 0)
922
925
        if supplied_retcode is not None:
923
 
            assert supplied_retcode == retcode
 
926
            if supplied_retcode != retcode:
 
927
                mutter('Output of bzr %s:\n%s', args, out)
 
928
                mutter('Error for bzr %s:\n%s', args, err)
 
929
                self.fail('Command bzr %s failed with retcode %s != %s'
 
930
                          % (args, supplied_retcode, retcode))
924
931
        return [out, err]
925
932
 
926
933
    def check_inventory_shape(self, inv, shape):
1424
1431
                   'bzrlib.tests.test_ignores',
1425
1432
                   'bzrlib.tests.test_inv',
1426
1433
                   'bzrlib.tests.test_knit',
 
1434
                   'bzrlib.tests.test_lazy_import',
1427
1435
                   'bzrlib.tests.test_lockdir',
1428
1436
                   'bzrlib.tests.test_lockable_files',
1429
1437
                   'bzrlib.tests.test_log',