On vire le kludge qui récupère le login dans la variable d'environnement.

C'est plus le rôle d'un wrapper (à venir) que du binding itself.
This commit is contained in:
Vincent Le Gallic 2013-05-16 03:53:00 +02:00
parent 3663d877cc
commit a620f5b5e9
2 changed files with 63 additions and 37 deletions

62
test.py
View file

@ -4,11 +4,18 @@ import psycopg2
import traceback
import random
import string
import os
import sys
sys.path.append("/usr/scripts/")
import lc_ldap
import config
from affich_tools import anim, OK, cprint, ERREUR
from gestion.affich_tools import anim, OK, cprint, ERREUR
show_traceback = False
if "--traceback" in sys.argv:
show_traceback = True
fast_test = False
if "--fast" in sys.argv:
fast_test = True
def randomMAC():
mac = [ 0x00, 0x16, 0x3e,
@ -117,7 +124,8 @@ def tests_machines(parent_dn, realm_list, ipsec=False):
print "Test de la librairie lc_ldap"
print "Connection"
conn= lc_ldap.lc_ldap_test()
current_user = os.getenv("SUDO_USER") or os.getenv("USER")
conn= lc_ldap.lc_ldap_test(user=current_user)
print u"Tests effectués avec les droits %s " % ', '.join(conn.droits)
@ -126,30 +134,32 @@ print u"Tests effectués avec les droits %s " % ', '.join(conn.droits)
# les adhérents et de toutes les machines #
###############################################
anim("Appel de allMachinesAdherents en rw")
try:
machines, adherents = conn.allMachinesAdherents(mode='rw')
except EnvironmentError as error:
print ERREUR
if show_traceback: print traceback.format_exc()
else: print "\t%s" % error
exit(1)
except Exception as error:
print ERREUR
if show_traceback: print traceback.format_exc()
else: print "\t%r" % error
anim("Fallback en ro")
machines, adherents = conn.allMachinesAdherents()
print OK
else:
print OK
machines_attrs_keys = keys_of_list_of_dict(machines, 'machines')
print "Test des attributs des machines"
test_list_of_dict(machines_attrs_keys, machines)
if not fast_test:
anim("Appel de allMachinesAdherents en rw")
try:
machines, adherents = conn.allMachinesAdherents(mode='rw')
except EnvironmentError as error:
print ERREUR
if show_traceback: print traceback.format_exc()
else: print "\t%s" % error
exit(1)
except Exception as error:
print ERREUR
if show_traceback: print traceback.format_exc()
else: print "\t%r" % error
anim("Fallback en ro")
machines, adherents = conn.allMachinesAdherents()
print OK
else:
print OK
adherents_attrs_keys = keys_of_list_of_dict(adherents, 'adherents')
print "Test des attributs des adhérents"
test_list_of_dict(adherents_attrs_keys, adherents)
machines_attrs_keys = keys_of_list_of_dict(machines, 'machines')
print "Test des attributs des machines"
test_list_of_dict(machines_attrs_keys, machines)
adherents_attrs_keys = keys_of_list_of_dict(adherents, 'adherents')
print "Test des attributs des adhérents"
test_list_of_dict(adherents_attrs_keys, adherents)
print "Test de création d'objets"