summaryrefslogtreecommitdiff
path: root/scripts/IceGridUtil.py
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2019-10-29 14:11:27 -0400
committerJoe George <joe@zeroc.com>2021-02-01 16:46:20 -0500
commit9f22d436c536c18df0e3c434162048490c80191f (patch)
treeda5257cb9435bcdbe3614e4f758e36244cac5ed0 /scripts/IceGridUtil.py
parentFixed doxygen warnings and updated configs. (diff)
downloadice-9f22d436c536c18df0e3c434162048490c80191f.tar.bz2
ice-9f22d436c536c18df0e3c434162048490c80191f.tar.xz
ice-9f22d436c536c18df0e3c434162048490c80191f.zip
Remove IcePatch2 (#602)
Removed IcePatch2 and the corresponding distrib and patching features in IceGrid and IceGridGUI.
Diffstat (limited to 'scripts/IceGridUtil.py')
-rw-r--r--scripts/IceGridUtil.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py
index 29306f361bd..19423ad322b 100644
--- a/scripts/IceGridUtil.py
+++ b/scripts/IceGridUtil.py
@@ -6,7 +6,6 @@ import sys, os
from Util import *
from IceBoxUtil import *
from Glacier2Util import *
-from IcePatch2Util import *
class IceGridProcess:
@@ -241,7 +240,6 @@ class IceGridTestCase(TestCase):
"icebox.exe" : IceBox().getCommandLine(current),
"icegridnode.exe" : IceGridNode().getCommandLine(current),
"glacier2router.exe" : Glacier2Router().getCommandLine(current),
- "icepatch2server.exe" : IcePatch2Server().getCommandLine(current),
"icegridregistry.exe" : IceGridRegistryMaster().getCommandLine(current),
"properties-override" : self.icegridnode[0].getPropertiesOverride(current),
}
@@ -259,7 +257,7 @@ class IceGridTestCase(TestCase):
application = self.application
if isinstance(self.mapping, CSharpMapping) and current.config.dotnetcore:
application = application.replace(".xml", ".netcoreapp.xml")
- self.runadmin(current, "application add -n {0} {1} {2}".format(application, varStr, targets))
+ self.runadmin(current, "application add {0} {1} {2}".format(application, varStr, targets))
def teardownClientSide(self, current, success):
if self.application: