← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_setup.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-11 21:41:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080711214124-qi09irlj7pd5cuzg
Shortcut the case when one revision is in the ancestry of the other.

At the cost of a heads() check, when one parent supersedes, we don't have to extract
the text for the other. Changes merge time from 3m37s => 3m21s. Using a
CachingParentsProvider would drop the time down to 3m11s.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_setup.py
20
20
import sys
21
21
import subprocess
22
22
import shutil
 
23
import tempfile
23
24
from tempfile import TemporaryFile
24
25
 
25
26
import bzrlib
55
56
            raise TestSkipped('You must have distutils installed to run this test.'
56
57
                              ' Usually this can be found by installing "python-dev"')
57
58
        self.log('test_build running in %s' % os.getcwd())
58
 
        install_dir = osutils.mkdtemp()
 
59
        install_dir = tempfile.mkdtemp()
59
60
        # setup.py must be run from the root source directory, but the tests
60
61
        # are not necessarily invoked from there
61
62
        self.source_dir = os.path.dirname(os.path.dirname(bzrlib.__file__))