From 67d75b52476f0cbccdd1a182be8af7dcfe78e355 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Sat, 26 May 2018 14:51:10 +0200 Subject: Support for components in test script --- scripts/IceStormUtil.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts/IceStormUtil.py') diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index b2fa3f3c758..42ff472ad24 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.py @@ -9,6 +9,8 @@ import sys, os from Util import * +from Component import component +from IceBoxUtil import * class IceStorm(ProcessFromBinDir, Server): @@ -41,7 +43,7 @@ class IceStorm(ProcessFromBinDir, Server): # Default properties props.update({ - 'IceBox.Service.IceStorm' : 'IceStormService,' + getIceSoVersion() + ':createIceStorm', + 'IceBox.Service.IceStorm' : 'IceStormService,' + component.getSoVersion() + ':createIceStorm', 'IceBox.PrintServicesReady' : 'IceStorm', 'IceBox.InheritProperties' : 1, 'IceStorm.InstanceName' : self.instanceName, @@ -141,7 +143,7 @@ class IceStormProcess: props["IceStormAdmin.TopicManager.{0}".format(name)] = testcase.getTopicManager(current, name) return props -class IceStormAdmin(ProcessFromBinDir, IceStormProcess, Client): +class IceStormAdmin(ProcessFromBinDir, ProcessIsReleaseOnly, IceStormProcess, Client): def __init__(self, instanceName=None, instance=None, *args, **kargs): Client.__init__(self, exe="icestormadmin", mapping=Mapping.getByName("cpp"), *args, **kargs) -- cgit v1.2.3