X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestUserSfa.py;h=6408b3edbb8ad3fa4b2527d0eecddc1d3811662a;hb=3f62be2bbaaae30826ee5607e7c06c6e91844c71;hp=a460f787820f1c3f0b319482fbcdc927f7459fbc;hpb=6ea3c825254eefc7c9dc80f30745e5b200ba7b0b;p=tests.git

diff --git a/system/TestUserSfa.py b/system/TestUserSfa.py
index a460f78..6408b3e 100644
--- a/system/TestUserSfa.py
+++ b/system/TestUserSfa.py
@@ -1,3 +1,6 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 import os, sys, time
 import xmlrpclib
 
@@ -5,23 +8,22 @@ import utils
 
 class TestUserSfa:
 
-    def __init__ (self,test_plc,plc_spec_sfa):
+    def __init__ (self,test_plc):
 	self.test_plc=test_plc
-	self.spec_sfa=plc_spec_sfa
-
-    def name(self):
-        return self.user_spec['user_fields']['email']
+        # shortcuts
+        self.sfa_spec=test_plc.plc_spec['sfa']
+        self.piuser=self.sfa_spec['piuser']
+        self.regularuser=self.sfa_spec['regularuser']
+        self.login_base=self.sfa_spec['login_base']
 
     def add_user (self):
-	return \
-        self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add  person.xml")==0
+	return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add person.xml")==0
 
     def update_user (self):
-	return \
-        self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ update  person.xml")==0
+	return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ update person.xml")==0
 
     def delete_user(self):
-	auth=self.spec_sfa['SFA_REGISTRY_ROOT_AUTH']
+	auth=self.sfa_spec['SFA_REGISTRY_ROOT_AUTH']
 	return \
-	self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t user %s.main.sfafakeuser1"%auth)==0
+            self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t user %s.%s.%s"%(auth,self.login_base,self.regularuser))==0