Rev 53: Uncomment vsftpd related-code while still inhibiting it. Make it easier to restart working on ftp servers. in file:///net/bigmamac/Volumes/home/vila/.bazaar/plugins/local_test_server/

[Vincent Ladeuil]

At file:///net/bigmamac/Volumes/home/vila/.bazaar/plugins/local_test_server/

------------------------------------------------------------
revno: 53
revision-id: v.ladeuil+lp at free.fr-20090220155131-6rcm7pb75gf0nlbj
parent: v.ladeuil+lp at free.fr-20090220152004-h64ikv1stmq5bmzx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: local_test_server
timestamp: Fri 2009-02-20 16:51:31 +0100
message:
  Uncomment vsftpd related-code while still inhibiting it. Make it easier to restart working on ftp servers.
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2008-10-01 12:51:07 +0000
+++ b/__init__.py	2009-02-20 15:51:31 +0000
@@ -90,6 +90,6 @@
 transport.register_lazy_transport(
     'http://',
     'bzrlib.plugins.local_test_server.test_server', 'HttpTransport_urllib')
-#transport.register_lazy_transport(
-#    'ftp://',
-#    'bzrlib.plugins.local_test_server.test_server', 'FtpTransport')
+transport.register_lazy_transport(
+    'ftp://',
+    'bzrlib.plugins.local_test_server.test_server', 'FtpTransport')

=== modified file 'config.py'
--- a/config.py	2009-02-17 15:10:08 +0000
+++ b/config.py	2009-02-20 15:51:31 +0000
@@ -182,12 +182,12 @@
         super(LighttpdDAV, self).__init__('lighttpd-dav', _base_dir=_base_dir)
 
 
-#class Vsftpd(Config):
-#
-#    def __init__(self, _base_dir=None):
-#        super(Vsftpd, self).__init__('vsftpd', _base_dir=_base_dir)
-#
-#
+class Vsftpd(Config):
+
+    def __init__(self, _base_dir=None):
+        super(Vsftpd, self).__init__('vsftpd', _base_dir=_base_dir)
+
+
 #class Proftpd(Config):
 #
 #    def __init__(self, _base_dir=None):

=== modified file 'server.py'
--- a/server.py	2009-02-20 15:20:04 +0000
+++ b/server.py	2009-02-20 15:51:31 +0000
@@ -617,6 +617,12 @@
         super(Vsftpd, self).__init__(_conf, port)
         self.output_config_path = self.config.abspath('etc/vsftpd.conf')
 
+    def is_installed(self):
+        if True: # FIXME: we still don't get the right solution to run an ftp
+                 # server without being root
+            return False
+        return super(Vsftpd, self).is_installed()
+
     def _start(self):
         # This is the best we can do: just spawn the process hoping nothing
         # goes wrong during server launch... There is nothing in the log to get
@@ -720,7 +726,7 @@
 _servers['lighttpd-dav'] = LighttpdDAV(37004)
 _servers['apache2-svn'] = Apache2SVN(37005)
 _servers['apache2-krb5'] = Apache2Kerberos(37006)
-#_servers['vsftpd'] = Vsftpd(37006)
+_servers['vsftpd'] = Vsftpd(37006)
 #_servers['proftpd'] = Proftpd(37007)
 _servers['apache2-https'] = Apache2HTTPS(37008)
 

=== modified file 'test_server.py'
--- a/test_server.py	2009-02-20 15:20:04 +0000
+++ b/test_server.py	2009-02-20 15:51:31 +0000
@@ -105,11 +105,11 @@
     _server_name = 'lighttpd-dav'
 
 
-#class VsftpdFeature(LocalTestServerFeature):
-#
-#    _server_name = 'vsftpd'
-#
-#
+class VsftpdFeature(LocalTestServerFeature):
+
+    _server_name = 'vsftpd'
+
+
 #class ProftpdFeature(LocalTestServerFeature):
 #
 #    _server_name = 'proftpd'
@@ -296,20 +296,20 @@
     _url_protocol = 'http+webdav'
 
 
-#class Vsftpd(LocalFTPTestServer):
-#
-#    _server_name = 'vsftpd'
-#
-#    def _build_base_url(self):
-#        # We use anonymous to avoid having to store the password of the user
-#        # running the tests
-#        return '%s://anonymous@%s:%s' % (self._url_protocol,
-#                                          self.host, self.port)
-#    def get_url(self):
-#        """See bzrlib.transport.Server.get_url."""
-#        return self._base_url + self._test_working_dir
-#
-#
+class Vsftpd(LocalFTPTestServer):
+
+    _server_name = 'vsftpd'
+
+    def _build_base_url(self):
+        # We use anonymous to avoid having to store the password of the user
+        # running the tests
+        return '%s://anonymous@%s:%s' % (self._url_protocol,
+                                          self.host, self.port)
+    def get_url(self):
+        """See bzrlib.transport.Server.get_url."""
+        return self._base_url + self._test_working_dir
+
+
 #class Proftpd(LocalFTPTestServer):
 #
 #    _server_name = 'proftpd'
@@ -387,9 +387,9 @@
         # FIXME: pycurl support missing
         permutations.append((HttpTransport_urllib, Apache2Kerberos))
 
-#    if VsftpdFeature().available():
-#        permutations.append((FtpTransport, Vsftpd))
-#
+    if VsftpdFeature().available():
+        permutations.append((FtpTransport, Vsftpd))
+
 #    if ProftpdFeature().available():
 #        permutations.append((FtpTransport, Proftpd))
 #

=== modified file 'tests/test_utils.py'
--- a/tests/test_utils.py	2009-02-20 15:20:04 +0000
+++ b/tests/test_utils.py	2009-02-20 15:51:31 +0000
@@ -153,13 +153,13 @@
                 _server_feature_class=test_server.LighttpdDAVFeature,
                 _test_server_class=test_server.LighttpdDAV,
                 )),
-#        ('vsftpd', dict(
-#                _server_name='vsftpd',
-#                _config_class=config.Vsftpd,
-#                _server_class=server.Vsftpd,
-#                _server_feature_class=test_server.VsftpdFeature,
-#                _test_server_class=test_server.Vsftpd,
-#                )),
+        ('vsftpd', dict(
+                _server_name='vsftpd',
+                _config_class=config.Vsftpd,
+                _server_class=server.Vsftpd,
+                _server_feature_class=test_server.VsftpdFeature,
+                _test_server_class=test_server.Vsftpd,
+                )),
 #        ('proftpd', dict(
 #                _server_name='proftpd',
 #                _config_class=config.Proftpd,