/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/blackbox/test_info.py

  • Committer: Alexander Belchenko
  • Date: 2007-10-04 05:35:10 UTC
  • mfrom: (2804.4.6 selftest.win32)
  • mto: This revision was merged to the branch mainline in revision 2884.
  • Revision ID: bialix@ukr.net-20071004053510-1zdsm5ywq7pq41et
changes after Martin's review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
23
23
import bzrlib
24
24
from bzrlib import (
25
25
    bzrdir,
 
26
    errors,
26
27
    osutils,
27
28
    repository,
28
29
    urlutils,
1131
1132
        def friendly_location(url):
1132
1133
            path = urlutils.unescape_for_display(url, 'ascii')
1133
1134
            try:
1134
 
                return osutils.relpath(os.getcwd(), path)
 
1135
                return osutils.relpath(osutils.getcwd(), path)
1135
1136
            except errors.PathNotChild:
1136
1137
                return path
1137
1138
 
1139
1140
            # We expect this to fail because of locking errors. (A write-locked
1140
1141
            # file cannot be read-locked in the same process).
1141
1142
            # This should be removed when the locking errors are fixed.
1142
 
            args = command_string.split(' ')
1143
 
            self.run_bzr_error([], 'info', *args)
 
1143
            self.run_bzr_error([], 'info ' + command_string)
1144
1144
            return
1145
1145
        out, err = self.run_bzr('info %s' % command_string)
1146
1146
        description = {