summaryrefslogtreecommitdiff
path: root/scripts/tests/Ice/udp.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-01-09 11:12:16 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-01-09 11:12:16 +0100
commit27f45794866bc600abcc3aa6207e0468660f908d (patch)
tree4b9ff5f33b84948a01258d8008b743fbc4013a18 /scripts/tests/Ice/udp.py
parentRenamed Slice/keyword test to clash, and added identifier-clash test (diff)
downloadice-27f45794866bc600abcc3aa6207e0468660f908d.tar.bz2
ice-27f45794866bc600abcc3aa6207e0468660f908d.tar.xz
ice-27f45794866bc600abcc3aa6207e0468660f908d.zip
Added support for SSL with automated UWP tests
Diffstat (limited to 'scripts/tests/Ice/udp.py')
-rw-r--r--scripts/tests/Ice/udp.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/tests/Ice/udp.py b/scripts/tests/Ice/udp.py
index 214d9aaf8f3..ce62874cb76 100644
--- a/scripts/tests/Ice/udp.py
+++ b/scripts/tests/Ice/udp.py
@@ -14,6 +14,11 @@ from Util import *
#
servers=range(0, 5)
+#
+# With UWP, we can't run the UDP tests with the C++ servers (used when SSL is enabled).
+#
+options=lambda current: { "protocol": ["tcp", "ws"] } if current.config.uwp else {}
+
TestSuite(__name__, [
ClientServerTestCase(client=Client(args=[5]), servers=[Server(args=[i], ready="McastTestAdapter") for i in servers])
-], multihost=False)
+], multihost=False, options=options)