X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestUserSfa.py;h=c95733fd7f4c38e84a789ec40de30aae0128aaa3;hb=3ddfdefd278472fe3d807a36449c27a0da9bc6fa;hp=49eb7ebac8b8d037bcfcac61d03f5261166b0cdd;hpb=649f388f61085663d060f100fa011fe81305053d;p=tests.git

diff --git a/system/TestUserSfa.py b/system/TestUserSfa.py
index 49eb7eb..c95733f 100644
--- a/system/TestUserSfa.py
+++ b/system/TestUserSfa.py
@@ -17,32 +17,35 @@ class TestUserSfa:
 
     def sfi_path(self): return self.test_auth_sfa.sfi_path()
     def qualified(self,name): return self.test_auth_sfa.qualified(name)
+    def sfi_pi(self,*args,**kwds): return self.test_auth_sfa.sfi_pi(*args, **kwds)
+    def sfi_user(self,*args,**kwds): return self.test_auth_sfa.sfi_user(*args, **kwds)
 
     # xxx todo - not the right place any longer - or is it ?
     def sfa_add_user (self,options):
         "add a regular user using sfi add"
-        sfi_add_options = self.user_spec['sfi_options']
         user_hrn = self.qualified(self.user_spec['name'])
-        command="sfi -d %s add"%(self.sfi_path())
+        command="add"
         command += " --type user"
         command += " --xrn %s"%user_hrn
         command += " --email %s"%self.user_spec['email']
-        for opt in sfi_add_options:
-            command += " %s"%(opt,)
+        command += " " + " ".join(self.user_spec['add_options'])
         # handle key separately because of embedded whitespace
         # hack - the user's pubkey is avail from his hrn
         command += " -k %s/%s.pub"%(self.sfi_path(),user_hrn)
-	return self.test_plc.run_in_guest(command)==0
+	return self.test_plc.run_in_guest(self.sfi_pi(command))==0
 
     def sfa_update_user (self,options):
         "update a user record using sfi update"
-        # xxx TODO now that we use sfi arguments
-        utils.header ("WARNING: TestUserSfa.update_user needs more work")
-        return True
+        user_hrn = self.qualified(self.user_spec['name'])
+        command="update"
+        command += " --type user"
+        command += " --xrn %s"%user_hrn
+        command += " " + " ".join(self.user_spec['update_options'])
+	return self.test_plc.run_in_guest(self.sfi_pi(command))==0
 
     def sfa_delete_user(self,options):
 	"run sfi delete on user record"
-	auth=self.test_auth_sfa.root_hrn()
+        user_hrn = self.qualified(self.user_spec['name'])
+        command="remove -t user %s"%user_hrn
 	return \
-            self.test_plc.run_in_guest("sfi -d %s remove -t user %s.%s.%s"%(
-                self.sfi_path(),auth,self.login_base,self.regularuser))==0
+            self.test_plc.run_in_guest(self.sfi_pi(command))==0