summaryrefslogtreecommitdiff
path: root/scripts/Component.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2020-08-27 09:03:45 +0200
committerGitHub <noreply@github.com>2020-08-27 09:03:45 +0200
commit90f5d7e4106cefdb1e8909c01384a684983b48da (patch)
treefa888039e7ea618f854a35d11064f8535e2c2c53 /scripts/Component.py
parentFixed package name typo in C++ build instructions (diff)
downloadice-90f5d7e4106cefdb1e8909c01384a684983b48da.tar.bz2
ice-90f5d7e4106cefdb1e8909c01384a684983b48da.tar.xz
ice-90f5d7e4106cefdb1e8909c01384a684983b48da.zip
Fixes to run service tests with SSL when --all is used (#1005)
Diffstat (limited to 'scripts/Component.py')
-rw-r--r--scripts/Component.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Component.py b/scripts/Component.py
index 8e7ac947eab..da3b891fe56 100644
--- a/scripts/Component.py
+++ b/scripts/Component.py
@@ -181,7 +181,7 @@ class Ice(Component):
if parent not in ["Ice", "IceBox", "IceGrid", "Glacier2", "IceStorm", "IceDiscovery", "IceBridge"]:
return None
- if not isinstance(testcase, ClientServerTestCase):
+ if isinstance(testcase, CollocatedTestCase):
return None
# Define here Ice tests which are slow to execute and for which it's not useful to test different options
@@ -189,7 +189,7 @@ class Ice(Component):
return self.serviceOptions
# We only run the client/server tests defined for cross testing with all transports
- if testcase.__class__.__name__ == 'ClientServerTestCase' and self.isCross(testcase.getTestSuite().getId()):
+ if isinstance(testcase, ClientServerTestCase) and self.isCross(testcase.getTestSuite().getId()):
return self.transportOptions
elif parent in ["Ice", "IceBox"]:
return self.coreOptions