summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Glacier2/sessionHelper/Client.cpp2
-rw-r--r--cpp/test/Ice/background/Transceiver.cpp4
-rw-r--r--cpp/test/Ice/background/Transceiver.h2
-rw-r--r--cpp/test/Ice/binding/AllTests.cpp12
-rw-r--r--cpp/test/Ice/proxy/AllTests.cpp2
-rwxr-xr-xcpp/test/IceStorm/rep1/run.py16
6 files changed, 19 insertions, 19 deletions
diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp
index 669fb7d7b32..7f38d70db77 100644
--- a/cpp/test/Glacier2/sessionHelper/Client.cpp
+++ b/cpp/test/Glacier2/sessionHelper/Client.cpp
@@ -160,7 +160,7 @@ public:
{
ex.ice_throw();;
}
- catch(const Ice::ConnectionRefusedException&)
+ catch(const Ice::ConnectFailedException&)
{
cout << "ok" << endl;
instance->notify();
diff --git a/cpp/test/Ice/background/Transceiver.cpp b/cpp/test/Ice/background/Transceiver.cpp
index 84114816101..a398f170bad 100644
--- a/cpp/test/Ice/background/Transceiver.cpp
+++ b/cpp/test/Ice/background/Transceiver.cpp
@@ -18,7 +18,7 @@ Transceiver::getNativeInfo()
}
IceInternal::SocketOperation
-Transceiver::initialize()
+Transceiver::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer)
{
#ifndef ICE_USE_IOCP
IceInternal::SocketOperation status = _configuration->initializeSocketOperation();
@@ -48,7 +48,7 @@ Transceiver::initialize()
_configuration->checkInitializeException();
if(!_initialized)
{
- IceInternal::SocketOperation status = _transceiver->initialize();
+ IceInternal::SocketOperation status = _transceiver->initialize(readBuffer, writeBuffer);
if(status != IceInternal::SocketOperationNone)
{
return status;
diff --git a/cpp/test/Ice/background/Transceiver.h b/cpp/test/Ice/background/Transceiver.h
index 03b873130d0..770272557b2 100644
--- a/cpp/test/Ice/background/Transceiver.h
+++ b/cpp/test/Ice/background/Transceiver.h
@@ -31,7 +31,7 @@ public:
virtual std::string type() const;
virtual std::string toString() const;
virtual Ice::ConnectionInfoPtr getInfo() const;
- virtual IceInternal::SocketOperation initialize();
+ virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&);
virtual void checkSendSize(const IceInternal::Buffer&, size_t);
private:
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index 0ab430667c5..2388bde4122 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -124,7 +124,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
test3->ice_ping();
test(false);
}
- catch(const Ice::ConnectionRefusedException&)
+ catch(const Ice::ConnectFailedException&)
{
}
}
@@ -468,7 +468,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
test->getAdapterName();
}
- catch(const Ice::ConnectionRefusedException&)
+ catch(const Ice::ConnectFailedException&)
{
}
@@ -516,7 +516,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
test(test3->ice_getConnection() == test1->ice_getConnection());
test(false);
}
- catch(const Ice::ConnectionRefusedException&)
+ catch(const Ice::ConnectFailedException&)
{
}
}
@@ -627,7 +627,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
test->getAdapterName();
}
- catch(const Ice::ConnectionRefusedException&)
+ catch(const Ice::ConnectFailedException&)
{
}
@@ -686,7 +686,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
test->getAdapterName();
}
- catch(const Ice::ConnectionRefusedException&)
+ catch(const Ice::ConnectFailedException&)
{
}
@@ -779,7 +779,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
testSecure->ice_ping();
test(false);
}
- catch(const Ice::ConnectionRefusedException&)
+ catch(const Ice::ConnectFailedException&)
{
}
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index ffc03b2fc7d..96d8c5df79a 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -906,7 +906,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
test(!ssl);
}
- catch(const Ice::ConnectionRefusedException&)
+ catch(const Ice::ConnectFailedException&)
{
test(ssl);
}
diff --git a/cpp/test/IceStorm/rep1/run.py b/cpp/test/IceStorm/rep1/run.py
index a202c9da68d..e030fa03ab3 100755
--- a/cpp/test/IceStorm/rep1/run.py
+++ b/cpp/test/IceStorm/rep1/run.py
@@ -102,7 +102,7 @@ icestorm.admin("create single")
for replica in range(1, 3):
icestorm.adminForReplica(replica, "create single", "error: topic `single' exists")
-icestorm.adminForReplica(0, "create single", "ConnectionRefused")
+icestorm.adminForReplica(0, "create single", "ConnectFailed")
icestorm.startReplica(0, echo=False)
@@ -120,7 +120,7 @@ icestorm.admin("create single")
for replica in range(0, 2):
icestorm.adminForReplica(replica, "create single", "error: topic `single' exists")
-icestorm.adminForReplica(2, "create single", "ConnectionRefused")
+icestorm.adminForReplica(2, "create single", "ConnectFailed")
icestorm.startReplica(2, echo=False)
@@ -138,7 +138,7 @@ icestorm.admin("destroy single")
for replica in range(1, 3):
icestorm.adminForReplica(replica, "destroy single", "error: couldn't find topic `single'")
-icestorm.adminForReplica(0, "destroy single", "ConnectionRefused")
+icestorm.adminForReplica(0, "destroy single", "ConnectFailed")
icestorm.startReplica(0, echo=False)
@@ -156,7 +156,7 @@ icestorm.admin("destroy single")
for replica in range(0, 2):
icestorm.adminForReplica(replica, "destroy single", "error: couldn't find topic `single'")
-icestorm.adminForReplica(2, "destroy single", "ConnectionRefused")
+icestorm.adminForReplica(2, "destroy single", "ConnectFailed")
icestorm.startReplica(2, echo=False)
@@ -192,7 +192,7 @@ runsub2()
for replica in range(0, 2):
runsub2(replica, "IceStorm::AlreadySubscribed")
-runsub2(2, "ConnectionRefused")
+runsub2(2, "ConnectFailed")
icestorm.startReplica(2, echo=False)
@@ -208,7 +208,7 @@ rununsub2()
for replica in range(0, 2):
rununsub2(replica)
-rununsub2(2, "ConnectionRefused")
+rununsub2(2, "ConnectFailed")
icestorm.startReplica(2, echo=False)
@@ -224,7 +224,7 @@ runsub2()
for replica in range(1, 3):
runsub2(replica, "IceStorm::AlreadySubscribed")
-runsub2(0, "ConnectionRefused")
+runsub2(0, "ConnectFailed")
icestorm.startReplica(0, echo=False)
@@ -240,7 +240,7 @@ rununsub2()
for replica in range(1, 3):
rununsub2(replica)
-rununsub2(0, "ConnectionRefused")
+rununsub2(0, "ConnectFailed")
icestorm.startReplica(0, echo=False)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 01:54:06 +0000