← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/stub_sftp.py

  • Committer: Vincent Ladeuil
  • Date: 2011-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/stub_sftp.py
118
118
    else:
119
119
        def canonicalize(self, path):
120
120
            if os.path.isabs(path):
121
 
                return osutils.normpath(path)
 
121
                return os.path.normpath(path)
122
122
            else:
123
 
                return osutils.normpath('/' + os.path.join(self.home, path))
 
123
                return os.path.normpath('/' + os.path.join(self.home, path))
124
124
 
125
125
    def chattr(self, path, attr):
126
126
        try:
553
553
 
554
554
    def get_url(self):
555
555
        """See bzrlib.transport.Server.get_url."""
556
 
        return self._get_sftp_url("%7E/")
 
556
        return self._get_sftp_url("~/")
557
557
 
558
558
 
559
559
class SFTPSiblingAbsoluteServer(SFTPAbsoluteServer):