Rev 54: Uncomment proftpd related code while still inhibiting it. 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: 54
revision-id: v.ladeuil+lp at free.fr-20090220155748-d5jf940jr9iis842
parent: v.ladeuil+lp at free.fr-20090220155131-6rcm7pb75gf0nlbj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: local_test_server
timestamp: Fri 2009-02-20 16:57:48 +0100
message:
  Uncomment proftpd related code while still inhibiting it.
-------------- next part --------------
=== modified file 'config.py'
--- a/config.py	2009-02-20 15:51:31 +0000
+++ b/config.py	2009-02-20 15:57:48 +0000
@@ -188,8 +188,8 @@
         super(Vsftpd, self).__init__('vsftpd', _base_dir=_base_dir)
 
 
-#class Proftpd(Config):
-#
-#    def __init__(self, _base_dir=None):
-#        super(Proftpd, self).__init__('proftpd', _base_dir=_base_dir)
+class Proftpd(Config):
+
+    def __init__(self, _base_dir=None):
+        super(Proftpd, self).__init__('proftpd', _base_dir=_base_dir)
 

=== modified file 'server.py'
--- a/server.py	2009-02-20 15:51:31 +0000
+++ b/server.py	2009-02-20 15:57:48 +0000
@@ -663,6 +663,12 @@
         super(Proftpd, self).__init__(_conf, port)
         self.output_config_path = self.config.abspath('etc/proftpd.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(Proftpd, self).is_installed()
+
     def _start(self):
         self._start_via_command(['sudo', self._server_command_name,
                                  '-c', self.output_config_path,
@@ -727,7 +733,7 @@
 _servers['apache2-svn'] = Apache2SVN(37005)
 _servers['apache2-krb5'] = Apache2Kerberos(37006)
 _servers['vsftpd'] = Vsftpd(37006)
-#_servers['proftpd'] = Proftpd(37007)
+_servers['proftpd'] = Proftpd(37007)
 _servers['apache2-https'] = Apache2HTTPS(37008)
 
 

=== modified file 'test_server.py'
--- a/test_server.py	2009-02-20 15:51:31 +0000
+++ b/test_server.py	2009-02-20 15:57:48 +0000
@@ -110,9 +110,9 @@
     _server_name = 'vsftpd'
 
 
-#class ProftpdFeature(LocalTestServerFeature):
-#
-#    _server_name = 'proftpd'
+class ProftpdFeature(LocalTestServerFeature):
+
+    _server_name = 'proftpd'
 
 
 class LocalTestServer(transport.Server):
@@ -310,23 +310,23 @@
         return self._base_url + self._test_working_dir
 
 
-#class Proftpd(LocalFTPTestServer):
-#
-#    _server_name = 'proftpd'
-#
-#    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."""
-#        # Remote the leading /tmp
-#        prefix = '/tmp/'
-#        if not self._test_working_dir.startswith(prefix):
-#            raise AssertionError('%s must start with %s'
-#                                 % (self._test_working_dir, prefix))
-#        return self._base_url + self._test_working_dir[len(prefix):]
+class Proftpd(LocalFTPTestServer):
+
+    _server_name = 'proftpd'
+
+    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."""
+        # Remote the leading /tmp
+        prefix = '/tmp/'
+        if not self._test_working_dir.startswith(prefix):
+            raise AssertionError('%s must start with %s'
+                                 % (self._test_working_dir, prefix))
+        return self._base_url + self._test_working_dir[len(prefix):]
 
 
 # We have registered a transport for the purpose of adding new servers in the
@@ -390,7 +390,7 @@
     if VsftpdFeature().available():
         permutations.append((FtpTransport, Vsftpd))
 
-#    if ProftpdFeature().available():
-#        permutations.append((FtpTransport, Proftpd))
-#
+    if ProftpdFeature().available():
+        permutations.append((FtpTransport, Proftpd))
+
     return permutations

=== modified file 'tests/test_utils.py'
--- a/tests/test_utils.py	2009-02-20 15:51:31 +0000
+++ b/tests/test_utils.py	2009-02-20 15:57:48 +0000
@@ -160,13 +160,13 @@
                 _server_feature_class=test_server.VsftpdFeature,
                 _test_server_class=test_server.Vsftpd,
                 )),
-#        ('proftpd', dict(
-#                _server_name='proftpd',
-#                _config_class=config.Proftpd,
-#                _server_class=server.Proftpd,
-#                _server_feature_class=test_server.ProftpdFeature,
-#                    _test_server_class=test_server.Proftpd,
-#                )),
+        ('proftpd', dict(
+                _server_name='proftpd',
+                _config_class=config.Proftpd,
+                _server_class=server.Proftpd,
+                _server_feature_class=test_server.ProftpdFeature,
+                    _test_server_class=test_server.Proftpd,
+                )),
         ]
     return scenarios