summaryrefslogtreecommitdiff
path: root/php/test
diff options
context:
space:
mode:
Diffstat (limited to 'php/test')
-rw-r--r--php/test/Ice/exceptions/Client.php4
-rwxr-xr-xphp/test/Ice/exceptions/run.py12
2 files changed, 8 insertions, 8 deletions
diff --git a/php/test/Ice/exceptions/Client.php b/php/test/Ice/exceptions/Client.php
index 05efe373a90..4bf8f798e16 100644
--- a/php/test/Ice/exceptions/Client.php
+++ b/php/test/Ice/exceptions/Client.php
@@ -281,7 +281,7 @@ function allTests($communicator)
}
catch(Exception $ex)
{
- $uue = $NS ? "Ice\\UnknownLocalException" : "Ice_UnknownLocalException";
+ $uue = $NS ? "Ice\\MemoryLimitException" : "Ice_MemoryLimitException";
if(!($ex instanceof $uue))
{
throw $ex;
@@ -295,7 +295,7 @@ function allTests($communicator)
}
catch(Exception $ex)
{
- $uue = $NS ? "Ice\\MemoryLimitException" : "Ice_MemoryLimitException";
+ $uue = $NS ? "Ice\\ConnectionLostException" : "Ice_ConnectionLostException";
if(!($ex instanceof $uue))
{
throw $ex;
diff --git a/php/test/Ice/exceptions/run.py b/php/test/Ice/exceptions/run.py
index 1da101f4919..144375fd2eb 100755
--- a/php/test/Ice/exceptions/run.py
+++ b/php/test/Ice/exceptions/run.py
@@ -21,25 +21,25 @@ sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
print("Running test with compact (default) format.")
-TestUtil.clientServerTest()
+TestUtil.clientServerTest(additionalClientOptions="--Ice.Warn.Connections=0")
print("Running test with sliced format.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat",
+TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat --Ice.Warn.Connections=0",
additionalServerOptions="--Ice.Default.SlicedFormat")
print("Running test with 1.0 encoding.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0 --Ice.Warn.Connections=0",
additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
print("Running test with compact (default) format and AMD server.")
-TestUtil.clientServerTest(server="serveramd")
+TestUtil.clientServerTest(server="serveramd", additionalClientOptions="--Ice.Warn.Connections=0")
print("Running test with sliced format and AMD server.")
TestUtil.clientServerTest(server="serveramd",
- additionalClientOptions="--Ice.Default.SlicedFormat",
+ additionalClientOptions="--Ice.Default.SlicedFormat --Ice.Warn.Connections=0",
additionalServerOptions="--Ice.Default.SlicedFormat")
print("Running test with 1.0 encoding and AMD server.")
TestUtil.clientServerTest(server="serveramd",
- additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalClientOptions="--Ice.Default.EncodingVersion=1.0 --Ice.Warn.Connections=0",
additionalServerOptions="--Ice.Default.EncodingVersion=1.0")