summaryrefslogtreecommitdiff
path: root/python/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-03-27 09:24:43 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-03-27 09:24:43 +0200
commit7a8af0219f7dd58cc6f954ce9a0c03d0c97bf05e (patch)
treefd2f244d477b4f18507742a675498559518dcdd6 /python/test
parentFix (ICE-7700) - SChannel Unknown key exchange (diff)
downloadice-7a8af0219f7dd58cc6f954ce9a0c03d0c97bf05e.tar.bz2
ice-7a8af0219f7dd58cc6f954ce9a0c03d0c97bf05e.tar.xz
ice-7a8af0219f7dd58cc6f954ce9a0c03d0c97bf05e.zip
Fixed Ice/optional cross-testing failure with JS servers
Diffstat (limited to 'python/test')
-rw-r--r--python/test/Ice/optional/AllTests.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/python/test/Ice/optional/AllTests.py b/python/test/Ice/optional/AllTests.py
index ee5565db1b4..2e15b015fe6 100644
--- a/python/test/Ice/optional/AllTests.py
+++ b/python/test/Ice/optional/AllTests.py
@@ -117,7 +117,7 @@ def allTests(communicator):
test(mo1.ioopd[5] == communicator.stringToProxy("test"))
test(mo1.bos == [False, True, False])
-
+
#
# Test generated struct and classes compare with Ice.Unset
#
@@ -564,6 +564,9 @@ def allTests(communicator):
(p2, p3) = initial.opOneOptional(Ice.Unset)
test(p2 is Ice.Unset and p3 is Ice.Unset)
+ if initial.supportsNullOptional():
+ (p2, p3) = initial.opOneOptional(None)
+ test(p2 is None and p3 is None)
p1 = Test.OneOptional(58)
(p2, p3) = initial.opOneOptional(p1)
test(p2.a == p1.a and p3.a == p1.a)