improvements in test shutdown and use hashlib no (BBB for py 2.4 included)

git-svn-id: https://svn.plone.org/svn/collective/bda.ldap/trunk@106784 db7f04ef-aaf3-0310-a811-c281ed44c4ad

Author: jensens

README.txt

@@ -98,6 +98,11 @@ TODO
 Changes
 -------
 
+  * 1.3.3 (unreleased)
+    * improved stop mechanism of ldap server in tests (jensens, 2009-12-16)
+    * remove deprecation warning: use `hashlib` for md5 and fallback to `md5`  
+      with python2.4. (jensens, 2009-12-16)
+
   * 1.3.2 (rnix, 2009-09-02)
     * handle timeout of cache, workaround atm
 

bootstrap.py

@@ -16,37 +16,84 @@
 Simply run this script in a directory containing a buildout.cfg.
 The script accepts buildout command-line options, so you can
 use the -c option to specify an alternate configuration file.
-
-$Id: bootstrap.py 72703 2007-02-20 11:49:26Z jim $
 """
 
 import os, shutil, sys, tempfile, urllib2
+from optparse import OptionParser
 
 tmpeggs = tempfile.mkdtemp()
 
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+is_jython = sys.platform.startswith('java')
+
+# parsing arguments
+parser = OptionParser()
+parser.add_option("-v", "--version", dest="version",
+                          help="use a specific zc.buildout version")
+
+options, args = parser.parse_args()
+
+if options.version is not None:
+    VERSION = '==%s' % options.version
+else:
+    VERSION = ''
+
+args = args + ['bootstrap']
+
+to_reload = False
+try:
+    import pkg_resources
+    if not hasattr(pkg_resources, '_distribute'):
+        to_reload = True
+        raise ImportError
+except ImportError:
+    ez = {}
+    exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
                      ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
 
-import pkg_resources
+    if to_reload:
+        reload(pkg_resources)
+    else:
+        import pkg_resources
 
-cmd = 'from setuptools.command.easy_install import main; main()'
 if sys.platform == 'win32':
-    cmd = '"%s"' % cmd # work around spawn lamosity on windows
-
-ws = pkg_resources.working_set
-assert os.spawnle(
-    os.P_WAIT, sys.executable, sys.executable,
-    '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
-    dict(os.environ,
-         PYTHONPATH=
-         ws.find(pkg_resources.Requirement.parse('setuptools')).location
-         ),
-    ) == 0
+    def quote(c):
+        if ' ' in c:
+            return '"%s"' % c # work around spawn lamosity on windows
+        else:
+            return c
+else:
+    def quote (c):
+        return c
+
+cmd = 'from setuptools.command.easy_install import main; main()'
+ws  = pkg_resources.working_set
+
+requirement = 'distribute'
+
+if is_jython:
+    import subprocess
+
+    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
+           quote(tmpeggs), 'zc.buildout' + VERSION],
+           env=dict(os.environ,
+               PYTHONPATH=
+               ws.find(pkg_resources.Requirement.parse(requirement)).location
+               ),
+           ).wait() == 0
+
+else:
+    assert os.spawnle(
+        os.P_WAIT, sys.executable, quote (sys.executable),
+        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
+        dict(os.environ,
+            PYTHONPATH=
+            ws.find(pkg_resources.Requirement.parse(requirement)).location
+            ),
+        ) == 0
 
 ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+ws.require('zc.buildout' + VERSION)
 import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
+zc.buildout.buildout.main(args)
 shutil.rmtree(tmpeggs)

buildout.cfg

@@ -1,7 +1,7 @@
 [buildout]
 extends = ldap.cfg
 develop = .
-parts = test py omelette
+parts = test py omelette dependencytree
 
 [test]
 recipe = zc.recipe.testrunner
@@ -12,8 +12,9 @@ environment = testenv
 
 [testenv]
 TESTLDIF = ${buildout:directory}/testenv/data.ldif
-SLAPDBIN = ${buildout:parts-directory}/openldap/libexec/slapd
-LDAPADDBIN = ${buildout:parts-directory}/openldap/bin/ldapadd
+SLAPDBIN = ${openldap:location}/libexec/slapd
+LDAPADDBIN = ${openldap:location}/bin/ldapadd
+LDAPPIDFILE = ${openldap:location}/var/run/slapd.pid
 DBDIR = ${buildout:parts-directory}/openldap/var/openldap-data
 
 [py]
@@ -25,3 +26,10 @@ eggs = ${test:eggs}
 recipe = collective.recipe.omelette
 eggs = ${test:eggs}
 ignore-develop = True
+
+[dependencytree]
+recipe = zc.recipe.egg
+eggs =
+    ${test:eggs}
+    tl.eggdeps
+ignore-develop = True

ldap.cfg

@@ -2,7 +2,7 @@
 # this build needs (on debian based systems):
 # apt-get install libsasl2-dev libssl-dev libdb4.4-dev
 recipe = zc.recipe.cmmi>=1.1.5
-url = ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/openldap-2.4.13.tgz
+url = ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/openldap-2.4.20.tgz
 extra_options = --with-sasl --with-tls --enable-slapd=yes
 patch = ${buildout:directory}/patches/getpeereid.patch
 patch_options = -p0

setup.py

@@ -37,7 +37,8 @@
       extras_require={
           'test': [
               'interlude',
-              'bda.cache [test]',        
+              'zope.configuration',
+              'zope.testing',        
           ]
       },
       entry_points="""

src/bda/ldap/base.py

@@ -10,7 +10,23 @@
 """
 
 import logging
-import md5
+
+    
+def md5digest(key):
+    """needed to support both, python 2.4 and python >=2.5
+    
+    remove when python 2.4 support is skipped.
+    """
+    try:
+        # in python >=2.5
+        import hashlib
+    except ImportError:
+        # fallback if python 2.4
+        import md5
+        return md5.new(key).hexdigest()
+    m = hashlib.md5()
+    m.update(key)
+    return m.hexdigest()
 
 logger = logging.getLogger('bda.ldap')
 
@@ -163,7 +179,7 @@ def search(self, queryFilter, scope, baseDN=None,
                                    baseDN,
                                    queryFilter,
                                    scope)
-            key=md5.new(key).hexdigest() # Hash keys to make them short Gogo.
+            key = md5digest(key)
             args = [baseDN, scope, queryFilter, attrlist, attrsonly]
             return self.cache.getData(self._con.search_s, key,
                                       force_reload, args)
@@ -174,7 +190,7 @@ def add(self, dn, data):
         """Insert an entry into directory.
         
         Takes the DN of the entry and the data this object contains. data is a
-        dictionary and looks ike this:
+        dictionary and looks like this:
         
         data = {
             'uid':'foo',
@@ -213,15 +229,18 @@ def delete(self, deleteDN):
         """
         self._con.delete_s(deleteDN)
 
-if __name__ == "__main__":
+
+def main():    
     """Use this module from command line for testing the connectivity to the
     LDAP Server.
     
     Expects server and port as arguments."""
-    
     import sys
     if len(sys.argv) < 3:
         print 'usage: python base.py [server] [port]'
     else:
         server, port = sys.argv[1:]
-        print testLDAPConnectivity(server, int(port))
+        print testLDAPConnectivity(server, int(port))
+        
+if __name__ == "__main__":
+    main()

src/bda/ldap/tests/stopslapd.txt

@@ -1,21 +1,17 @@
 Stop openldap server.
 
-  >>> import os
-
-Normally the os increases the pid of the forked process by 1. There might be
-the case where some other process is started between the root process and the
-forking of the child process, in this case the simple pid + 1 increasing will
-fail and we kill the wrong process
-
-XXX: improve this
-
-  >>> os.kill(slapdpid + 1, 9)
+    >>> PIDFILE = os.environ.get('LDAPPIDFILE')
+    >>> with open(PIDFILE) as pidfile:
+    ...     pid = pidfile.readline()
+    >>> pid = int(pid.strip())
+    >>> import os
+    >>> os.kill(pid, 9)
 
 Flush openldap db files.
 
-  >>> import os
-  >>> dbdir = os.environ.get('DBDIR')
-  >>> for file in os.listdir(dbdir):
-  ...     os.remove('%s/%s' % (dbdir, file))
-  >>> os.listdir(dbdir)
-  []
+    >>> import os
+    >>> dbdir = os.environ.get('DBDIR')
+    >>> for file in os.listdir(dbdir):
+    ...     os.remove('%s/%s' % (dbdir, file))
+    >>> os.listdir(dbdir)
+    []

src/bda/ldap/tests/test_ldap.py

@@ -1,18 +1,13 @@
-__author__ = """Robert Niederreiter <[email protected]>"""
-__docformat__ = 'plaintext'
+# Copyright 2008-2009, BlueDynamics Alliance, Austria - http://bluedynamics.com
+# GNU General Public Licence Version 2 or later
 
 import time
 import os
-from subprocess import Popen
+import subprocess
 import unittest
 import interlude
-import zope.component
-from pprint import pprint
+import pprint
 from zope.testing import doctest
-from zope.app.testing.placelesssetup import setUp, tearDown
-from zope.configuration.xmlconfig import XMLConfig
-
-import bda.ldap
 
 optionflags = doctest.NORMALIZE_WHITESPACE | \
               doctest.ELLIPSIS | \
@@ -28,8 +23,7 @@
 """
 
 slapdbin = os.environ.get('SLAPDBIN', None)
-pr = Popen([slapdbin, '-h', 'ldap://127.0.0.1:12345/'])
-slapdpid = pr.pid
+pr = subprocess.Popen([slapdbin, '-h', 'ldap://127.0.0.1:12345/'])
 time.sleep(1)
 
 TESTFILES = [
@@ -40,19 +34,20 @@
 ]
 
 def test_suite():
-    setUp()
+    from zope.configuration.xmlconfig import XMLConfig
+    import zope.component
     XMLConfig('meta.zcml', zope.component)()
+    import bda.ldap
     XMLConfig('configure.zcml', bda.ldap)()
     return unittest.TestSuite([
         doctest.DocFileSuite(
             file, 
             optionflags=optionflags,
             globs={'interact': interlude.interact,
-                   'pprint': pprint,
-                   'slapdpid': slapdpid},
+                   'pprint': pprint.pprint,
+                  },
         ) for file in TESTFILES
     ])
-    tearDown()
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')