summaryrefslogtreecommitdiff
path: root/scripts/IceGridUtil.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-05-26 14:51:10 +0200
committerBenoit Foucher <benoit@zeroc.com>2018-05-26 14:51:10 +0200
commit67d75b52476f0cbccdd1a182be8af7dcfe78e355 (patch)
tree5ebfab1788fc03f6dc81dbe6ca81e4c525f23207 /scripts/IceGridUtil.py
parentAdded support for stripping out invalid XML characters from the JUnit XML fil... (diff)
downloadice-67d75b52476f0cbccdd1a182be8af7dcfe78e355.tar.bz2
ice-67d75b52476f0cbccdd1a182be8af7dcfe78e355.tar.xz
ice-67d75b52476f0cbccdd1a182be8af7dcfe78e355.zip
Support for components in test script
Diffstat (limited to 'scripts/IceGridUtil.py')
-rw-r--r--scripts/IceGridUtil.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py
index c7cb63e585a..1829fad1c91 100644
--- a/scripts/IceGridUtil.py
+++ b/scripts/IceGridUtil.py
@@ -9,6 +9,9 @@
import sys, os
from Util import *
+from IceBoxUtil import *
+from Glacier2Util import *
+from IcePatch2Util import *
class IceGridProcess:
@@ -45,7 +48,7 @@ class IceGridClient(IceGridProcess, Client):
getParentProps = Client.getProps # Used by IceGridProcess to get the client properties
-class IceGridAdmin(ProcessFromBinDir, IceGridClient):
+class IceGridAdmin(ProcessFromBinDir, ProcessIsReleaseOnly, IceGridClient):
def __init__(self, replica=None, username="admin1", password="test1", *args, **kargs):
IceGridClient.__init__(self, replica=replica, exe="icegridadmin", mapping=Mapping.getByName("cpp"),
@@ -238,8 +241,8 @@ class IceGridTestCase(TestCase):
"properties-override" : self.icegridnode[0].getPropertiesOverride(current),
}
- if platform.getDotnetExe():
- variables["dotnet.exe"] = platform.getDotnetExe()
+ if platform.getDotNetExe():
+ variables["dotnet.exe"] = platform.getDotNetExe()
# Add variables that point to the directories containing the built executables
for (k, v) in self.exevars.items():