Fix IceStorm to correctly load topics from database

Close #222

1 files changed, 15 insertions, 10 deletions

diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py
index 42ff472ad24..8f61c6f5140 100644
--- a/scripts/IceStormUtil.py
+++ b/scripts/IceStormUtil.py
@@ -14,29 +14,34 @@ from IceBoxUtil import *
 
 class IceStorm(ProcessFromBinDir, Server):
 
-    def __init__(self, instanceName="IceStorm", replica=0, nreplicas=0, transient=False, portnum=0, *args, **kargs):
+    def __init__(self, instanceName="IceStorm", replica=0, nreplicas=0, transient=False, portnum=0,
+                 createDb=True, cleanDb=True, *args, **kargs):
         Server.__init__(self, exe="icebox", ready="IceStorm", mapping=Mapping.getByName("cpp"), *args, **kargs)
         self.portnum = portnum
         self.replica = replica
         self.nreplicas = nreplicas
         self.transient = transient
         self.instanceName = instanceName
+        self.createDb = createDb
+        self.cleanDb = cleanDb
         self.desc = self.instanceName if self.nreplicas == 0 else "{0} replica #{1}".format(self.instanceName,
                                                                                             self.replica)
 
     def setup(self, current):
         # Create the database directory
-        self.dbdir = os.path.join(current.testsuite.getPath(), "{0}-{1}.db".format(self.instanceName, self.replica))
-        if os.path.exists(self.dbdir):
-            shutil.rmtree(self.dbdir)
-        os.mkdir(self.dbdir)
+        if self.createDb:
+            self.dbdir = os.path.join(current.testsuite.getPath(), "{0}-{1}.db".format(self.instanceName, self.replica))
+            if os.path.exists(self.dbdir):
+                shutil.rmtree(self.dbdir)
+            os.mkdir(self.dbdir)
 
     def teardown(self, current, success):
-        # Remove the database directory tree
-        try:
-            shutil.rmtree(self.dbdir)
-        except:
-            pass
+        if self.cleanDb:
+            # Remove the database directory tree
+            try:
+                shutil.rmtree(self.dbdir)
+            except:
+                pass
 
     def getProps(self, current):
         props = Server.getProps(self, current)