From 2656d00ac7f6f2b68a3ec24076577c97293d1233 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 5 Jul 2012 18:14:39 +0200 Subject: [PATCH] new step sfa_fsclean, and added to the 'sfa' macro step --- system/TestPlc.py | 9 +++++++-- system/macros.py | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/system/TestPlc.py b/system/TestPlc.py index 090014d..c40d4be 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -1297,6 +1297,11 @@ class TestPlc: self.run_in_guest("sfa-nuke.py")==0 or \ self.run_in_guest("sfa-nuke-plc.py")==0 + def sfa_fsclean(self): + "cleanup /etc/sfa/trusted_roots and /var/lib/sfa" + self.run_in_guest("rm -rf /etc/sfa/trusted_roots /var/lib/sfa/authorities") + return True + def sfa_plcclean(self): "cleans the PLC entries that were created as a side effect of running the script" # ignore result @@ -1354,7 +1359,7 @@ class TestPlc: if not os.path.isdir(dirname): utils.system("mkdir -p %s"%dirname) if not os.path.isdir(dirname): - raise "Cannot create config dir for plc %s"%self.name() + raise Exception,"Cannot create config dir for plc %s"%self.name() return dirname def conffile(self,filename): @@ -1438,7 +1443,7 @@ class TestPlc: and self.test_ssh.copy_abs(reg_fname,'/%s/etc/sfa/registries.xml'%self.vm_root_in_host())==0 def sfa_import(self): - "sfa-import-plc" + "use sfaadmin to import from plc" auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'] return \ self.run_in_guest('sfaadmin reg import_registry')==0 diff --git a/system/macros.py b/system/macros.py index 981b14b..0c7464a 100644 --- a/system/macros.py +++ b/system/macros.py @@ -10,6 +10,7 @@ sequences['sfa_restart'] = [ 'sfa_stop', 'sfa_plcclean', 'sfa_dbclean', + 'sfa_fsclean', 'sfa_configure', 'sfa_start', 'sfa_import', -- 2.47.0