From 2c7c781021bd02d744227d8ba34ce2a9914fcc85 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 27 Jan 2012 16:46:49 +0100
Subject: [PATCH] tmp - try sfa-import.py and sfa-import-plc.py (same for nuke)
---
system/TestPlc.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/system/TestPlc.py b/system/TestPlc.py
index ab2c501..d50f349 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1148,7 +1148,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):
@@ -1287,7 +1287,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))
--
2.47.0