summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/config/TestUtil.py4
-rw-r--r--cpp/test/Ice/faultTolerance/AllTests.cpp14
-rwxr-xr-xcpp/test/Ice/faultTolerance/run.py2
-rw-r--r--cpp/test/Ice/location/AllTests.cpp8
-rw-r--r--cpp/test/Ice/locationForward/AllTests.cpp8
-rw-r--r--cpp/test/Ice/operations/Client.cpp4
-rw-r--r--java/test/Ice/faultTolerance/AllTests.java12
-rwxr-xr-xjava/test/Ice/faultTolerance/run.py2
-rw-r--r--java/test/Ice/location/AllTests.java14
-rw-r--r--java/test/Ice/locationForward/AllTests.java6
-rw-r--r--java/test/Ice/operations/Client.java4
11 files changed, 47 insertions, 31 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 9519e2c437e..ca000a7230a 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -16,8 +16,8 @@ import sys, os
# protocol. Otherwise TCP is used.
#
-protocol = "ssl"
-#protocol = ""
+#protocol = "ssl"
+protocol = ""
#
# Set compressed to 1 in case you want to run the tests with
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index 7671910430b..0dfbca787f2 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/AllTests.cpp
@@ -57,7 +57,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
obj->abort();
test(false);
}
- catch(const Ice::SocketException&)
+ catch(const Ice::ConnectionLostException&)
{
cout << "ok" << endl;
}
@@ -70,7 +70,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
obj->idempotentAbort();
test(false);
}
- catch(const Ice::SocketException&)
+ catch(const Ice::ConnectionLostException&)
{
cout << "ok" << endl;
}
@@ -84,7 +84,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
obj->nonmutatingAbort();
test(false);
}
- catch(const Ice::SocketException&)
+ catch(const Ice::ConnectionLostException&)
{
cout << "ok" << endl;
}
@@ -102,8 +102,12 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
obj->ice_ping();
test(false);
}
- catch(const Ice::SocketException&)
+ catch(const Ice::CloseConnectionException&)
{
cout << "ok" << endl;
- }
+ }
+ catch(const Ice::ConnectFailedException&)
+ {
+ cout << "ok" << endl;
+ }
}
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index a190afab3b9..0517a502f16 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -25,7 +25,7 @@ testdir = os.path.join(toplevel,"test", "Ice", "faultTolerance")
server = os.path.join(testdir, "server")
client = os.path.join(testdir, "client")
-num = 10
+num = 6
base = 12340
updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp
index 62cba6a87eb..7750464c58a 100644
--- a/cpp/test/Ice/location/AllTests.cpp
+++ b/cpp/test/Ice/location/AllTests.cpp
@@ -62,7 +62,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
{
obj2->ice_ping();
}
- catch(const Ice::SocketException&)
+ catch(const Ice::LocalException&)
{
test(false);
}
@@ -95,7 +95,11 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
obj2->ice_ping();
test(false);
}
- catch(const Ice::SocketException&)
+ catch(const Ice::CloseConnectionException&)
+ {
+ cout << "ok" << endl;
+ }
+ catch(const Ice::ConnectFailedException&)
{
cout << "ok" << endl;
}
diff --git a/cpp/test/Ice/locationForward/AllTests.cpp b/cpp/test/Ice/locationForward/AllTests.cpp
index 9da70ed4393..047f225b5da 100644
--- a/cpp/test/Ice/locationForward/AllTests.cpp
+++ b/cpp/test/Ice/locationForward/AllTests.cpp
@@ -47,8 +47,12 @@ allTests(const Ice::CommunicatorPtr& communicator, int port, int lastPort)
lastObj->ice_ping();
test(false);
}
- catch(const Ice::SocketException&)
+ catch(const Ice::CloseConnectionException&)
{
cout << "ok" << endl;
- }
+ }
+ catch(const Ice::ConnectFailedException&)
+ {
+ cout << "ok" << endl;
+ }
}
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index 78ae8503934..bf7aca3e676 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -35,10 +35,6 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
{
cout << "ok" << endl;
}
- catch(const Ice::ConnectionLostException&) // For Java compatibility
- {
- cout << "ok" << endl;
- }
return EXIT_SUCCESS;
}
diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java
index abd2bd448f4..5f858cd160c 100644
--- a/java/test/Ice/faultTolerance/AllTests.java
+++ b/java/test/Ice/faultTolerance/AllTests.java
@@ -65,7 +65,7 @@ public class AllTests
obj.abort();
test(false);
}
- catch(Ice.SocketException ex)
+ catch(Ice.ConnectionLostException ex)
{
System.out.println("ok");
}
@@ -79,7 +79,7 @@ public class AllTests
obj.idempotentAbort();
test(false);
}
- catch(Ice.SocketException ex)
+ catch(Ice.ConnectionLostException ex)
{
System.out.println("ok");
}
@@ -94,7 +94,7 @@ public class AllTests
obj.nonmutatingAbort();
test(false);
}
- catch(Ice.SocketException ex)
+ catch(Ice.ConnectionLostException ex)
{
System.out.println("ok");
}
@@ -113,7 +113,11 @@ public class AllTests
obj.ice_ping();
test(false);
}
- catch(Ice.SocketException ex)
+ catch(Ice.CloseConnectionException ex)
+ {
+ System.out.println("ok");
+ }
+ catch(Ice.ConnectFailedException ex)
{
System.out.println("ok");
}
diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py
index e895d6957bc..e0f074100d7 100755
--- a/java/test/Ice/faultTolerance/run.py
+++ b/java/test/Ice/faultTolerance/run.py
@@ -27,7 +27,7 @@ classpath = os.path.join(toplevel, "lib") + TestUtil.sep + os.path.join(testdir,
server = "java -classpath \"" + classpath + "\" Server"
client = "java -classpath \"" + classpath + "\" Client"
-num = 10
+num = 6
base = 12340
updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java
index 3b93725cb96..16a5507567e 100644
--- a/java/test/Ice/location/AllTests.java
+++ b/java/test/Ice/location/AllTests.java
@@ -72,7 +72,7 @@ public class AllTests
{
obj2.ice_ping();
}
- catch(Ice.SocketException ex)
+ catch(Ice.LocalException ex)
{
test(false);
}
@@ -109,10 +109,14 @@ public class AllTests
obj2.ice_ping();
test(false);
}
- catch(Ice.SocketException ex)
- {
- System.out.println("ok");
- }
+ catch(Ice.CloseConnectionException ex)
+ {
+ System.out.println("ok");
+ }
+ catch(Ice.ConnectFailedException ex)
+ {
+ System.out.println("ok");
+ }
System.out.print("shutdown server manager...");
System.out.flush();
diff --git a/java/test/Ice/locationForward/AllTests.java b/java/test/Ice/locationForward/AllTests.java
index 4829c3ea0d3..420931987c6 100644
--- a/java/test/Ice/locationForward/AllTests.java
+++ b/java/test/Ice/locationForward/AllTests.java
@@ -54,7 +54,11 @@ public class AllTests
lastObj.ice_ping();
test(false);
}
- catch(Ice.SocketException ex)
+ catch(Ice.CloseConnectionException ex)
+ {
+ System.out.println("ok");
+ }
+ catch(Ice.ConnectFailedException ex)
{
System.out.println("ok");
}
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index e95491eccec..bb4068c4c09 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -31,10 +31,6 @@ public class Client
{
System.out.println("ok");
}
- catch(Ice.ConnectionLostException ex)
- {
- System.out.println("ok");
- }
return 0;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 23:07:26 +0000