summaryrefslogtreecommitdiff
path: root/python/test/Ice/optional/Server.py
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-07-19 16:23:59 -0400
committerJoe George <joe@zeroc.com>2016-07-19 16:23:59 -0400
commitbc9778e005f31820656612b127582d497409af31 (patch)
tree4cf609eee934dc7ad4c7d57a071c7b321a51d33e /python/test/Ice/optional/Server.py
parentC++11 support in test/Ice/echo (diff)
parentICE-7239 - Disable Ice.Warn.Dispatch for Python Ice/proxy test (diff)
downloadice-bc9778e005f31820656612b127582d497409af31.tar.bz2
ice-bc9778e005f31820656612b127582d497409af31.tar.xz
ice-bc9778e005f31820656612b127582d497409af31.zip
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'python/test/Ice/optional/Server.py')
-rwxr-xr-xpython/test/Ice/optional/Server.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py
index 6f1d9f2fdb7..bf4236de34d 100755
--- a/python/test/Ice/optional/Server.py
+++ b/python/test/Ice/optional/Server.py
@@ -139,7 +139,7 @@ class InitialI(Test.Initial):
pass
def returnOptionalClass(self, req, current=None):
- return Test.OneOptional(5)
+ return Test.OneOptional(53)
def opG(self, g, current=None):
return g
@@ -156,6 +156,9 @@ class InitialI(Test.Initial):
def supportsCsharpSerializable(self, current=None):
return True
+ def supportsCppStringView(self, current=None):
+ return False
+
def run(args, communicator):
communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
adapter = communicator.createObjectAdapter("TestAdapter")