← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_info.py

  • Committer: Alexander Belchenko
  • Date: 2007-09-07 08:46:20 UTC
  • mto: (2839.6.2 3)
  • mto: This revision was merged to the branch mainline in revision 2884.
  • Revision ID: bialix@ukr.net-20070907084620-7t25v0anhxompa0m
fix for test_info-tests: using osutils.getcwd instead of os.getcwd (sigh)

Show diffs side-by-side

added added

removed removed

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