integrate sfaadmin script into tests

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 65a5ee0..b2d423c 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1149,7 +1149,9 @@ class TestPlc:
 
     def sfa_dbclean(self):
         "thoroughly wipes off the SFA database"
-        self.run_in_guest("sfa-nuke.py")==0 or self.run_in_guest("sfa-nuke-plc.py")
+        self.run_in_guest("sfa-nuke.py")==0 or \
+        self.run_in_guest("sfa-nuke-plc.py") or \
+        self.run_in_guest("sfaadmin.py registry nuke")
         return True
 
     def sfa_plcclean(self):
@@ -1287,8 +1289,10 @@ 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.py')==0 or self.run_in_guest('sfa-import-plc.py')==0
+        auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
+        return self.run_in_guest('sfa-import.py')==0 or \
+               self.run_in_guest('sfa-import-plc.py')==0 or \
+               self.run_in_guest('sfaadmin.py registry import_registry')
 # not needed anymore
 #        self.run_in_guest('cp /etc/sfa/authorities/%s/%s.pkey /etc/sfa/authorities/server.key'%(auth,auth))