diff --git a/test.py b/test.py index d661a7c..2aae7aa 100755 --- a/test.py +++ b/test.py @@ -141,32 +141,34 @@ print u"Tests effectués avec les droits %s " % ', '.join(conn.droits) # les adhérents et de toutes les 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") +anim("Appel de allMachinesAdherents en %s" % ('ro' if fast_test else 'rw')) +try: + if fast_test: machines, adherents = conn.allMachinesAdherents() - print OK else: - print OK + 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) - - 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"