From 102eb1bbd89cdfe7b1d877d127638e9a1ce58262 Mon Sep 17 00:00:00 2001 From: Vincent Le Gallic Date: Fri, 22 Mar 2013 13:50:46 +0100 Subject: [PATCH] =?UTF-8?q?[modif=20non=20commit=C3=A9es]=20lc=5Fldap=5Fte?= =?UTF-8?q?sts=20est=20un=20vieux=20test=20qui=20ne=20sert=20plus=20=C3=A0?= =?UTF-8?q?=20rien?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lc_ldap.py | 2 +- lc_ldap_tests.py | 87 ------------------------------------------------ 2 files changed, 1 insertion(+), 88 deletions(-) delete mode 100755 lc_ldap_tests.py diff --git a/lc_ldap.py b/lc_ldap.py index 036594e..8e608ae 100644 --- a/lc_ldap.py +++ b/lc_ldap.py @@ -59,7 +59,7 @@ sys.path.append('/usr/scripts/gestion') import config import crans_utils import attributs -from ldap_locks import CransLock +import ldap_locks uri = 'ldap://ldap.adm.crans.org/' base_dn = 'ou=data,dc=crans,dc=org' diff --git a/lc_ldap_tests.py b/lc_ldap_tests.py deleted file mode 100755 index 399018c..0000000 --- a/lc_ldap_tests.py +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -# LC_LDAP_TESTS.PY-- Tests sur les fonctions lc_ldap. -# -# Copyright (C) 2010 Cr@ns -# Author: Nicolas Dandrimont -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the Cr@ns nor the names of its contributors may -# be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -import unittest - -from lc_ldap import attrify, lc_ldap_test - -class LDAPTest(unittest.TestCase): - """Classe de base pour les tests nécessitant la base LDAP""" - def setUp(self): - """Déclare une connexion à la base LDAP de tests""" - self.ldap = lc_ldap_test() - - def attrify_light(self, val, champ): - """Transforme une valeur en objet Attr avec un LDIF minimaliste""" - return attrify(val, champ, {champ: [val]}, self.ldap) - -class AdherentTest(LDAPTest): - """Classe de test de la création d'un adhérent""" - tests = ["creationAdherent", "creationCompte"] - - def creationAdherent(self): - """Crée un adhérent""" - self.adherent = self.ldap.newAdherent({ - 'nom': [u"Passoir"], - 'prenom': [u"Toto"], - 'tel': [u"01 23 45 67 89"], - 'chbre': [u"G001"], - 'mail': [u"dave.null@toto.example"], - }) - self.ldap.delete_s(self.adherent.dn) - - def creationCompte(self): - self.adherent = self.ldap.newAdherent({ - 'nom' : [u'McLellan'], - 'prenom' : [u'Stue'], - 'tel': [u'01 47 51 00 00'], - 'chbre': [u"G001"], - 'mail': [u'nobody@nowhere.example'], - }) - self.adherent.compte(u'mclellan') - self.ldap.delete_s(self.adherent.dn) - - -def auto_suite(testcase): - """Suite de tests 'automatique'""" - suite = unittest.TestSuite() - for test in testcase.tests: - suite.addTest(testcase(test)) - return suite - -TEST_SUITE = unittest.TestSuite(( - auto_suite(AdherentTest), - )) - -if __name__ == "__main__": - RUNNER = unittest.TextTestRunner() - RUNNER.run(TEST_SUITE)