Rev 48: Plug tests against proftpd if the local_test_sever plugin is in http://bazaar.launchpad.net/%7Ebzr-upload-devs/bzr-upload/trunk

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Ebzr-upload-devs/bzr-upload/trunk

------------------------------------------------------------
revno: 48
revision-id: v.ladeuil+lp at free.fr-20080627174038-425vqyn6utwawsnu
parent: v.ladeuil+lp at free.fr-20080622161827-6f4igifc2epaq4nb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: upload
timestamp: Fri 2008-06-27 19:40:38 +0200
message:
  Plug tests against proftpd if the local_test_sever plugin is
  installed and the server launched.
  
  * tests/test_upload.py:
  (TransportAdapter._test_permutations): Add profptd tests if
  available.
modified:
  tests/test_upload.py           test_upload.py-20080307145942-xx1xgifrreovahgz-2
-------------- next part --------------
=== modified file 'tests/test_upload.py'
--- a/tests/test_upload.py	2008-06-22 16:18:27 +0000
+++ b/tests/test_upload.py	2008-06-27 17:40:38 +0000
@@ -67,6 +67,25 @@
                 # Continue even if a dependency prevents us 
                 # from adding this test
                 pass
+        try:
+            import bzrlib.plugins.local_test_server
+            from bzrlib.plugins.local_test_server import test_server
+            if False:
+                # XXX: Disable since we can't get chmod working for anonymous
+                # user
+                scenario = ('vsftpd',
+                            {'transport_class': test_server.FtpTransport,
+                             'transport_server': test_server.Vsftpd,
+                             })
+                result.append(scenario)
+            if test_server.ProftpdFeature().available():
+                scenario = ('proftpd',
+                            {'transport_class': test_server.FtpTransport,
+                             'transport_server': test_server.Proftpd,
+                             })
+                result.append(scenario)
+        except ImportError:
+            pass
         return result