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

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_setup.py
21
21
import sys
22
22
import subprocess
23
23
 
24
 
import breezy
25
 
from .. import tests
 
24
import bzrlib
 
25
from bzrlib import tests
26
26
 
27
27
# TODO: Run bzr from the installed copy to see if it works.  Really we need to
28
28
# run something that exercises every module, just starting it may not detect
40
40
        """
41
41
        # setup.py must be run from the root source directory, but the tests
42
42
        # are not necessarily invoked from there
43
 
        self.source_dir = os.path.dirname(os.path.dirname(breezy.__file__))
 
43
        self.source_dir = os.path.dirname(os.path.dirname(bzrlib.__file__))
44
44
        if not os.path.isfile(os.path.join(self.source_dir, 'setup.py')):
45
 
            self.skipTest(
46
 
                'There is no setup.py file adjacent to the breezy directory')
 
45
            self.skip(
 
46
                'There is no setup.py file adjacent to the bzrlib directory')
47
47
        try:
48
48
            import distutils.sysconfig
49
49
            makefile_path = distutils.sysconfig.get_makefile_filename()
50
50
            if not os.path.exists(makefile_path):
51
 
                self.skipTest(
 
51
                self.skip(
52
52
                    'You must have the python Makefile installed to run this'
53
53
                    ' test. Usually this can be found by installing'
54
54
                    ' "python-dev"')
55
55
        except ImportError:
56
 
            self.skipTest(
 
56
            self.skip(
57
57
                'You must have distutils installed to run this test.'
58
58
                ' Usually this can be found by installing "python-dev"')
59
59
        self.log('test_build running from %s' % self.source_dir)