/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

  • Committer: Vincent Ladeuil
  • Date: 2009-04-02 06:29:02 UTC
  • mto: (4234.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4235.
  • Revision ID: v.ladeuil+lp@free.fr-20090402062902-xenjze5i1fzv8xu1
Fixed as per Robert's review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
549
549
            except ImportError:
550
550
                test.run(result)
551
551
            else:
552
 
                if type(test) == testtools.ConcurrentTestSuite:
 
552
                if isinstance(testtools.ConcurrentTestSuite, test):
553
553
                    # We need to catch bzr specific behaviors
554
554
                    test.run(BZRTransformingResult(result))
555
555
                else:
2685
2685
        return suite
2686
2686
    from testtools import ConcurrentTestSuite
2687
2687
    return ConcurrentTestSuite(suite, fork_for_tests)
2688
 
 
2689
 
 
2690
2688
parallel_registry.register('fork', fork_decorator)
2691
2689
 
2692
2690
 
2696
2694
        return suite
2697
2695
    from testtools import ConcurrentTestSuite
2698
2696
    return ConcurrentTestSuite(suite, reinvoke_for_tests)
2699
 
 
2700
 
 
2701
2697
parallel_registry.register('subprocess', subprocess_decorator)
2702
2698
 
2703
2699