revert to using sfaadmin reg import_registry for lxc16 builds that
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 5 Jul 2012 10:13:06 +0000 (12:13 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 5 Jul 2012 10:13:06 +0000 (12:13 +0200)
don't run the latest sfa

system/TestPlc.py

index 0813baf..9cad404 100644 (file)
@@ -1293,7 +1293,7 @@ class TestPlc:
 
     def sfa_dbclean(self):
         "thoroughly wipes off the SFA database"
-        return self.run_in_guest("sfaadmin registry nuke")==0 or \
+        return self.run_in_guest("sfaadmin reg nuke")==0 or \
             self.run_in_guest("sfa-nuke.py")==0 or \
             self.run_in_guest("sfa-nuke-plc.py")==0
 
@@ -1441,7 +1441,7 @@ class TestPlc:
         "sfa-import-plc"
         auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
         return \
-            self.run_in_guest('sfaadmin reg import')==0 
+            self.run_in_guest('sfaadmin reg import_registry')==0 
 # not needed anymore
 #        self.run_in_guest('cp /etc/sfa/authorities/%s/%s.pkey /etc/sfa/authorities/server.key'%(auth,auth))