X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=65a5ee0735a6e20f99a427eb50fc039e525a56f1;hb=d36bfd8283b07c907f831a6b6fe7b77b346b7576;hp=dae829b09078aaf9d64960c4165a4df1f8b2ac0a;hpb=47f6437cdd23fcd435f7c23ea1fc5d684b489c23;p=tests.git

diff --git a/system/TestPlc.py b/system/TestPlc.py
index dae829b..65a5ee0 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -203,8 +203,9 @@ class TestPlc:
         if isinstance (rpms, list): 
             rpms=" ".join(rpms)
         self.run_in_guest("yum -y install %s"%rpms)
-        self.run_in_guest("yum-complete-transaction")
-        return  self.run_in_guest("rpm -q %s"%rpms)==0
+        # yum-complete-transaction comes with yum-utils, that is in vtest.pkgs
+        self.run_in_guest("yum-complete-transaction -y")
+        return self.run_in_guest("rpm -q %s"%rpms)==0
 
     def auth_root (self):
 	return {'Username':self.plc_spec['PLC_ROOT_USER'],
@@ -1148,7 +1149,7 @@ class TestPlc:
 
     def sfa_dbclean(self):
         "thoroughly wipes off the SFA database"
-        self.run_in_guest("sfa-nuke-plc.py")==0
+        self.run_in_guest("sfa-nuke.py")==0 or self.run_in_guest("sfa-nuke-plc.py")
         return True
 
     def sfa_plcclean(self):
@@ -1240,11 +1241,12 @@ class TestPlc:
                      'SFA_DB_USER',
                      'SFA_DB_PASSWORD',
                      'SFA_DB_NAME',
+                     'SFA_API_LOGLEVEL',
                      ]:
             if self.plc_spec['sfa'].has_key(var):
                 fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var]))
         # the way plc_config handles booleans just sucks..
-        for var in ['SFA_API_DEBUG']:
+        for var in []:
             val='false'
             if self.plc_spec['sfa'][var]: val='true'
             fileconf.write ('e %s\n%s\n'%(var,val))
@@ -1286,7 +1288,7 @@ class TestPlc:
     def sfa_import(self):
         "sfa-import-plc"
 	auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
-        return self.run_in_guest('sfa-import-plc.py')==0
+        return self.run_in_guest('sfa-import.py')==0 or self.run_in_guest('sfa-import-plc.py')==0
 # not needed anymore
 #        self.run_in_guest('cp /etc/sfa/authorities/%s/%s.pkey /etc/sfa/authorities/server.key'%(auth,auth))