have iterate-ping-node display its logdir

[tests.git] / system / TestUser.py

diff --git a/system/TestUser.py b/system/TestUser.py
index 6646e04..12728ee 100644 (file)
--- a/system/TestUser.py
+++ b/system/TestUser.py
@@ -1,6 +1,8 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 import os, sys, time
 import xmlrpclib
-import pprint
 
 import utils
 
@@ -27,24 +29,21 @@ class TestUser:
         fields=user_spec['user_fields']
         auth=self.test_plc.auth_root()
         utils.header('Adding user %s - roles %r'%(fields['email'],user_spec['roles']))
-        self.test_plc.server.AddPerson(auth,fields)
-        self.test_plc.server.UpdatePerson(auth,fields['email'],{'enabled': True})
+        self.test_plc.apiserver.AddPerson(auth,fields)
+        self.test_plc.apiserver.UpdatePerson(auth,fields['email'],{'enabled': True})
         for role in user_spec['roles']:
-            self.test_plc.server.AddRoleToPerson(auth,role,fields['email'])
-        self.test_plc.server.AddPersonToSite(auth,
+            self.test_plc.apiserver.AddRoleToPerson(auth,role,fields['email'])
+        self.test_plc.apiserver.AddPersonToSite(auth,
                                              self.name(),
                                              self.test_site.name())
 
     def delete_user(self):
         auth=self.test_plc.auth_root()
-        self.test_plc.server.DeletePerson(auth,self.name())
+        self.test_plc.apiserver.DeletePerson(auth,self.name())
 
     def add_keys (self):
         user_spec=self.user_spec
-        for keyname in user_spec['keynames']:
-            key=self.test_plc.locate_key(keyname)
+        for key_name in user_spec['key_names']:
+            key_spec=self.test_plc.locate_key(key_name)
             auth=self.auth()
-            self.test_plc.server.AddPersonKey(auth,self.name(), key['key_fields'])
-            
-
-        
+            self.test_plc.apiserver.AddPersonKey(auth,self.name(), key_spec['key_fields'])