← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Martin Pool
  • Date: 2011-11-29 00:49:17 UTC
  • mto: This revision was merged to the branch mainline in revision 6320.
  • Revision ID: mbp@canonical.com-20111129004917-jt6h39iuv4vq64ze
Set up test timeouts before configuring features

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
996
996
 
997
997
    def setUp(self):
998
998
        super(TestCase, self).setUp()
999
 
        for feature in getattr(self, '_test_needs_features', []):
1000
 
            self.requireFeature(feature)
1001
 
        self._cleanEnvironment()
1002
999
 
1003
1000
        timeout = config.GlobalStack().get('selftest.timeout')
1004
1001
        if timeout:
1006
1003
            timeout_fixture.setUp()
1007
1004
            self.addCleanup(timeout_fixture.cleanUp)
1008
1005
 
 
1006
        for feature in getattr(self, '_test_needs_features', []):
 
1007
            self.requireFeature(feature)
 
1008
        self._cleanEnvironment()
 
1009
 
1009
1010
        if bzrlib.global_state is not None:
1010
1011
            self.overrideAttr(bzrlib.global_state, 'cmdline_overrides',
1011
1012
                              config.CommandLineStore())