Refact ldap fixture and add gearbox command to start test ldap server

tracim/__init__.py

@@ -0,0 +1 @@
+__author__ = 'bux'

tracim/s.py

@@ -1,59 +0,0 @@
-from time import sleep
-
-from ldap_test import LdapServer
-
-server = LdapServer({
-            'port': 3333,
-            'password': 'toor',
-
-            'bind_dn': 'cn=admin,dc=directory,dc=fsf,dc=org',
-            'base': {
-                'objectclass': ['dcObject', 'organization'],
-                'dn': 'dc=directory,dc=fsf,dc=org',
-                'attributes': {
-                    'o': 'Free Software Foundation',
-                    'dc': 'directory'
-                }
-            },
-
-            'entries': [
-                {
-                    'objectclass': ['organizationalRole'],
-                    'dn': 'cn=admin,dc=directory,dc=fsf,dc=org',
-                    'attributes': {
-                        'cn': 'admin'
-                    }
-                },
-                {
-                    'objectclass': ['organizationalUnit'],
-                    'dn': 'ou=people,dc=directory,dc=fsf,dc=org',
-                    'attributes': {
-                        'ou': 'people',
-                    }
-                },
-                {
-                    'objectclass': ['organizationalUnit'],
-                    'dn': 'ou=groups,dc=directory,dc=fsf,dc=org',
-                    'attributes': {
-                        'ou': 'groups',
-                    }
-                },
-                {
-                    'objectclass': ['account', 'top'],
-                    'dn': 'cn=richard-not-real-email@fsf.org,ou=people,dc=directory,dc=fsf,dc=org',
-                    'attributes': {
-                        'uid': 'richard-not-real-email@fsf.org',
-                        'userPassword': 'rms',
-                        'givenName': 'Richard',
-                        'sn': 'Stallman',
-                        'mail': 'richard-not-real-email@fsf.org'
-                    }
-                },
-            ]
-        })
-
-server.start()
-try:
-    sleep(999999999)
-except KeyboardInterrupt:
-    pass

tracim/setup.py

@@ -69,6 +69,9 @@ setup(
         ],
         'gearbox.plugins': [
             'turbogears-devtools = tg.devtools'
+        ],
+        'gearbox.commands': [
+            'ldap_server = tracim.command.ldap_test_server:LDAPTestServerCommand',
         ]
     },
     dependency_links=[

tracim/tracim/command/__init__.py

@@ -0,0 +1 @@
+__author__ = 'bux'

tracim/tracim/command/ldap_test_server.py

@@ -0,0 +1,18 @@
+from time import sleep
+from tracim.fixtures.ldap import ldap_test_server_fixtures
+from gearbox.command import Command
+from ldap_test import LdapServer
+
+
+class LDAPTestServerCommand(Command):
+    def take_action(self, parsed_args):
+        # TODO - B.S. - 20160210: paramètre argv pour preciser les fixtures
+        server = LdapServer(ldap_test_server_fixtures)
+        print("Starting LDAP server on localhost (port %d)" % ldap_test_server_fixtures.get('port'))
+        print("Press CTRL+C to stop it")
+        server.start()
+        try:
+            while True:
+                sleep(1)
+        except KeyboardInterrupt:
+            pass

tracim/tracim/fixtures/ldap.py

@@ -0,0 +1,56 @@
+ldap_test_server_fixtures = {
+    'port': 3333,
+    'password': 'toor',
+
+    'bind_dn': 'cn=admin,dc=directory,dc=fsf,dc=org',
+    'base': {
+        'objectclass': ['dcObject', 'organization'],
+        'dn': 'dc=directory,dc=fsf,dc=org',
+        'attributes': {
+            'o': 'Free Software Foundation',
+            'dc': 'directory'
+        }
+    },
+
+    'entries': [
+        {
+            'objectclass': ['organizationalRole'],
+            'dn': 'cn=admin,dc=directory,dc=fsf,dc=org',
+            'attributes': {
+                'cn': 'admin'
+            }
+        },
+        {
+            'objectclass': ['organizationalUnit'],
+            'dn': 'ou=people,dc=directory,dc=fsf,dc=org',
+            'attributes': {
+                'ou': 'people',
+            }
+        },
+        {
+            'objectclass': ['organizationalUnit'],
+            'dn': 'ou=groups,dc=directory,dc=fsf,dc=org',
+            'attributes': {
+                'ou': 'groups',
+            }
+        },
+        {
+            'objectclass': ['account', 'top'],
+            'dn': 'cn=richard-not-real-email@fsf.org,ou=people,dc=directory,dc=fsf,dc=org',
+            'attributes': {
+                'uid': 'richard-not-real-email@fsf.org',
+                'userPassword': 'rms',
+                'mail': 'richard-not-real-email@fsf.org'
+            }
+        },
+        {
+            'objectclass': ['account', 'top'],
+            'dn': 'cn=lawrence-not-real-email@fsf.org,ou=people,dc=directory,dc=fsf,dc=org',
+            'attributes': {
+                'uid': 'lawrence-not-real-email@fsf.org',
+                'userPassword': 'foobarbaz',
+                'mail': 'lawrence-not-real-email@fsf.org'
+            }
+        },
+    ]
+}

tracim/tracim/tests/functional/test_ldap_authentication.py

@@ -2,8 +2,8 @@
 """
 Integration tests for the ldap authentication sub-system.
 """
+from tracim.fixtures.ldap import ldap_test_server_fixtures
 from nose.tools import eq_
-from tg import config
 
 from tracim.model import DBSession, User
 from tracim.tests import LDAPTest, TracimTestController
@@ -11,53 +11,7 @@ from tracim.tests import LDAPTest, TracimTestController
 
 class TestAuthentication(LDAPTest, TracimTestController):
     application_under_test = 'ldap'
-    ldap_server_data = {
-            'port': 3333,
-            'password': 'toor',
-
-            'bind_dn': 'cn=admin,dc=directory,dc=fsf,dc=org',
-            'base': {
-                'objectclass': ['dcObject', 'organization'],
-                'dn': 'dc=directory,dc=fsf,dc=org',
-                'attributes': {
-                    'o': 'Free Software Foundation',
-                    'dc': 'directory'
-                }
-            },
-
-            'entries': [
-                {
-                    'objectclass': ['organizationalRole'],
-                    'dn': 'cn=admin,dc=directory,dc=fsf,dc=org',
-                    'attributes': {
-                        'cn': 'admin'
-                    }
-                },
-                {
-                    'objectclass': ['organizationalUnit'],
-                    'dn': 'ou=people,dc=directory,dc=fsf,dc=org',
-                    'attributes': {
-                        'ou': 'people',
-                    }
-                },
-                {
-                    'objectclass': ['organizationalUnit'],
-                    'dn': 'ou=groups,dc=directory,dc=fsf,dc=org',
-                    'attributes': {
-                        'ou': 'groups',
-                    }
-                },
-                {
-                    'objectclass': ['account', 'top'],
-                    'dn': 'cn=richard-not-real-email@fsf.org,ou=people,dc=directory,dc=fsf,dc=org',
-                    'attributes': {
-                        'uid': 'richard-not-real-email@fsf.org',
-                        'userPassword': 'rms',
-                        'mail': 'richard-not-real-email@fsf.org'
-                    }
-                },
-            ]
-        }
+    ldap_server_data = ldap_test_server_fixtures
 
     def test_ldap_auth_fail(self):
         # User is unknown in tracim database