From e7333297345efda9379045495d17aadb571ddd50 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 18 Apr 2014 18:31:48 +0200 Subject: Fixed (ICE-4858) - Eliminate IceDB --- scripts/IceStormUtil.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'scripts/IceStormUtil.py') diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index 4e1a299d051..9ddb0ecbea5 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.py @@ -127,11 +127,7 @@ class Replicated(IceStormUtil): self.dbHome.append(dbHome) TestUtil.cleanDbDir(dbHome) - sqlOptions = TestUtil.getQtSqlOptions('IceStorm', dbHome) - if len(sqlOptions) == 0: - self.iceStormDBEnv.append(' --Freeze.DbEnv.IceStorm.DbHome="%s"' % dbHome) - else: - self.iceStormDBEnv.append(" %s" % sqlOptions) + self.iceStormDBEnv.append(' --Freeze.DbEnv.IceStorm.DbHome="%s"' % dbHome) self.procs.append(None) topicReplicaProxy = '%s/TopicManager:%s' % (instanceName, replicaTopicManagerEndpoints) @@ -227,11 +223,7 @@ class NonReplicated(IceStormUtil): self.dbHome = os.path.join(self.testdir, self.dbDir) TestUtil.cleanDbDir(self.dbHome) - sqlOptions = TestUtil.getQtSqlOptions('IceStorm', self.dbHome) - if len(sqlOptions) == 0: - self.iceStormDBEnv = ' --Freeze.DbEnv.IceStorm.DbHome="%s"' % self.dbHome - else: - self.iceStormDBEnv = " " + sqlOptions + self.iceStormDBEnv = ' --Freeze.DbEnv.IceStorm.DbHome="%s"' % self.dbHome def clean(self): TestUtil.cleanDbDir(self.dbHome) -- cgit v1.2.3