summaryrefslogtreecommitdiff
path: root/py/test
diff options
context:
space:
mode:
Diffstat (limited to 'py/test')
-rw-r--r--py/test/Ice/binding/AllTests.py4
-rwxr-xr-xpy/test/Ice/binding/Server.py1
-rwxr-xr-xpy/test/Ice/enums/run.py4
-rw-r--r--py/test/Ice/exceptions/Test.ice5
-rw-r--r--py/test/Ice/exceptions/TestAMD.ice4
-rwxr-xr-xpy/test/Ice/exceptions/run.py20
-rwxr-xr-xpy/test/Ice/objects/run.py9
-rw-r--r--py/test/Ice/servantLocator/AllTests.py10
-rwxr-xr-xpy/test/Ice/slicing/exceptions/run.py10
-rwxr-xr-xpy/test/Ice/slicing/objects/run.py10
10 files changed, 55 insertions, 22 deletions
diff --git a/py/test/Ice/binding/AllTests.py b/py/test/Ice/binding/AllTests.py
index 5d4ae944058..52c494813ad 100644
--- a/py/test/Ice/binding/AllTests.py
+++ b/py/test/Ice/binding/AllTests.py
@@ -340,13 +340,13 @@ def allTests(communicator):
while i < nRetry and t.getAdapterName() == "Adapter36":
i = i + 1
test(i == nRetry)
- t.ice_getConnection().close(True)
+ t.ice_getConnection().close(False)
adapters.append(com.createObjectAdapter("Adapter35", endpoints[1].toString()))
i = 0
while i < nRetry and t.getAdapterName() == "Adapter35":
i = i + 1
test(i == nRetry)
- t.ice_getConnection().close(True)
+ t.ice_getConnection().close(False)
adapters.append(com.createObjectAdapter("Adapter34", endpoints[0].toString()))
i = 0
while i < nRetry and t.getAdapterName() == "Adapter34":
diff --git a/py/test/Ice/binding/Server.py b/py/test/Ice/binding/Server.py
index d9a399ce1af..1c00d1b5557 100755
--- a/py/test/Ice/binding/Server.py
+++ b/py/test/Ice/binding/Server.py
@@ -15,7 +15,6 @@ Ice.loadSlice('Test.ice')
import Test, TestI
def run(args, communicator):
- communicator.getProperties().setProperty("Ice.Warn.Connections", "0")
communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
adapter = communicator.createObjectAdapter("TestAdapter")
id = communicator.stringToIdentity("communicator")
diff --git a/py/test/Ice/enums/run.py b/py/test/Ice/enums/run.py
index ecadfca52b9..9d197cb0ea6 100755
--- a/py/test/Ice/enums/run.py
+++ b/py/test/Ice/enums/run.py
@@ -21,6 +21,8 @@ sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
print("Running test with 1.0 encoding.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+
print("Running test with 1.1 encoding.")
TestUtil.clientServerTest()
diff --git a/py/test/Ice/exceptions/Test.ice b/py/test/Ice/exceptions/Test.ice
index 5c9b79da101..61cd21cc6d1 100644
--- a/py/test/Ice/exceptions/Test.ice
+++ b/py/test/Ice/exceptions/Test.ice
@@ -18,9 +18,7 @@ interface Empty
interface Thrower;
-exception Base {};
-
-exception A extends Base
+exception A
{
int aMem;
};
@@ -48,7 +46,6 @@ module Mod
};
};
-
["ami"] interface Thrower
{
void shutdown();
diff --git a/py/test/Ice/exceptions/TestAMD.ice b/py/test/Ice/exceptions/TestAMD.ice
index c2c396f4d69..e92e1e02ccf 100644
--- a/py/test/Ice/exceptions/TestAMD.ice
+++ b/py/test/Ice/exceptions/TestAMD.ice
@@ -14,9 +14,7 @@ module Test
interface Thrower;
-exception Base {};
-
-exception A extends Base
+exception A
{
int aMem;
};
diff --git a/py/test/Ice/exceptions/run.py b/py/test/Ice/exceptions/run.py
index f5bfcf34b4b..d8490a69e88 100755
--- a/py/test/Ice/exceptions/run.py
+++ b/py/test/Ice/exceptions/run.py
@@ -22,15 +22,27 @@ import TestUtil
print("Running test with compact (default) format.")
TestUtil.clientServerTest()
+
print("Running test with sliced format.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat")
+TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat",
+ additionalServerOptions="--Ice.Default.SlicedFormat")
+
print("Running test with 1.0 encoding.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+
print("Running test with compact (default) format and AMD server.")
TestUtil.clientServerTest(server="ServerAMD.py")
+
print("Running test with sliced format and AMD server.")
-TestUtil.clientServerTest(server="ServerAMD.py", additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat")
+TestUtil.clientServerTest(server="ServerAMD.py",
+ additionalClientOptions="--Ice.Default.SlicedFormat",
+ additionalServerOptions="--Ice.Default.SlicedFormat")
+
print("Running test with 1.0 encoding and AMD server.")
-TestUtil.clientServerTest(server="ServerAMD.py", additionalClientOptions="--Ice.Default.EncodingVersion=1.0", additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+TestUtil.clientServerTest(server="ServerAMD.py",
+ additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+
print("Running collocated test.")
TestUtil.collocatedTest()
diff --git a/py/test/Ice/objects/run.py b/py/test/Ice/objects/run.py
index b71b37f48fd..abfd9232fad 100755
--- a/py/test/Ice/objects/run.py
+++ b/py/test/Ice/objects/run.py
@@ -22,9 +22,14 @@ import TestUtil
print("Running test with compact (default) format.")
TestUtil.clientServerTest()
+
print("Running test with sliced format.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat")
+TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat",
+ additionalServerOptions="--Ice.Default.SlicedFormat")
+
print("Running test with 1.0 encoding.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+
print("Running collocated test.")
TestUtil.collocatedTest()
diff --git a/py/test/Ice/servantLocator/AllTests.py b/py/test/Ice/servantLocator/AllTests.py
index 4f4cd4a53bb..9aa1df9f449 100644
--- a/py/test/Ice/servantLocator/AllTests.py
+++ b/py/test/Ice/servantLocator/AllTests.py
@@ -54,6 +54,10 @@ def testExceptions(obj, collocated):
test(False)
except Ice.UnknownUserException as ex:
test(ex.unknown.find("Test::TestIntfUserException") >= 0)
+ except Ice.OperationNotExistException:
+ pass
+ except AttributeError:
+ pass
except:
test(False)
@@ -62,7 +66,7 @@ def testExceptions(obj, collocated):
test(False)
except Ice.UnknownLocalException as ex:
test(not collocated)
- test(ex.unknown.find("Ice.SocketException") >= 0)
+ test(ex.unknown.find("Ice.SocketException") >= 0 or ex.unknown.find("Ice::SocketException") >= 0)
except SocketException:
test(collocated)
except:
@@ -73,6 +77,10 @@ def testExceptions(obj, collocated):
test(False)
except Ice.UnknownException as ex:
test(ex.unknown.find("RuntimeError: message") >= 0)
+ except Ice.OperationNotExistException:
+ pass
+ except AttributeError:
+ pass
except:
test(False)
diff --git a/py/test/Ice/slicing/exceptions/run.py b/py/test/Ice/slicing/exceptions/run.py
index bcd92b267d6..fc2b7f50cd3 100755
--- a/py/test/Ice/slicing/exceptions/run.py
+++ b/py/test/Ice/slicing/exceptions/run.py
@@ -22,9 +22,15 @@ import TestUtil
print("Running test with sliced format.")
TestUtil.clientServerTest()
+
print("Running test with 1.0 encoding.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+
print("Running test with sliced format and AMD server.")
TestUtil.clientServerTest(server="ServerAMD.py")
+
print("Running test with 1.0 encoding and AMD server.")
-TestUtil.clientServerTest(server="ServerAMD.py", additionalClientOptions="--Ice.Default.EncodingVersion=1.0", additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+TestUtil.clientServerTest(server="ServerAMD.py",
+ additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
diff --git a/py/test/Ice/slicing/objects/run.py b/py/test/Ice/slicing/objects/run.py
index bcd92b267d6..8cbe30de77c 100755
--- a/py/test/Ice/slicing/objects/run.py
+++ b/py/test/Ice/slicing/objects/run.py
@@ -22,9 +22,15 @@ import TestUtil
print("Running test with sliced format.")
TestUtil.clientServerTest()
+
print("Running test with 1.0 encoding.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+
print("Running test with sliced format and AMD server.")
TestUtil.clientServerTest(server="ServerAMD.py")
+
print("Running test with 1.0 encoding and AMD server.")
-TestUtil.clientServerTest(server="ServerAMD.py", additionalClientOptions="--Ice.Default.EncodingVersion=1.0", additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+TestUtil.clientServerTest(server="ServerAMD.py",
+ additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 23:12:20 +0000