~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/ftp_server.py

  • Committer: Robert Collins
  • Date: 2008-02-13 03:30:01 UTC
  • mfrom: (3221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3224.
  • Revision ID: robertc@robertcollins.net-20080213033001-rw70ul0zb02ph856
Merge to fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
191
191
        """Calculate an ftp url to this server."""
192
192
        return 'ftp://foo:bar@localhost:%d/' % (self._port)
193
193
 
194
 
#    def get_bogus_url(self):
195
 
#        """Return a URL which cannot be connected to."""
196
 
#        return 'ftp://127.0.0.1:1'
 
194
    def get_bogus_url(self):
 
195
        """Return a URL which cannot be connected to."""
 
196
        return 'ftp://127.0.0.1:1'
197
197
 
198
198
    def log(self, message):
199
199
        """This is used by medusa.ftp_server to log connections, etc."""