diff options
| author | Joe George <joe@zeroc.com> | 2016-08-30 11:37:01 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-08-30 11:38:46 -0400 |
| commit | 5b34410c278acab9eb296ce4d24f80e69b6fd6dc (patch) | |
| tree | 1aac49502a08970e9f730d6a4ebaa7cf03ee8048 /php | |
| parent | Fixed minor bug with client side user exception check that would occur with 1... (diff) | |
| download | ice-5b34410c278acab9eb296ce4d24f80e69b6fd6dc.tar.bz2 ice-5b34410c278acab9eb296ce4d24f80e69b6fd6dc.tar.xz ice-5b34410c278acab9eb296ce4d24f80e69b6fd6dc.zip | |
ICE-7242 - Cross test updates
Diffstat (limited to 'php')
| -rw-r--r-- | php/test/Ice/exceptions/Client.php | 5 | ||||
| -rwxr-xr-x | php/test/Ice/exceptions/run.py | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/php/test/Ice/exceptions/Client.php b/php/test/Ice/exceptions/Client.php index cfc27d988ad..37042b9d5a2 100644 --- a/php/test/Ice/exceptions/Client.php +++ b/php/test/Ice/exceptions/Client.php @@ -432,6 +432,11 @@ $initData = $NS ? eval("return new Ice\\InitializationData;") : eval("return new $initData->properties = Ice_getProperties(); $initData->properties->setProperty("Ice.MessageSizeMax", "10"); $communicator = Ice_initialize($argv, $initData); + +// This property is set by the test suite, howerver we need to override it for this test. +// Unlike C++, we can not pass $argv into Ice::createProperties, so we just set it after. +$communicator->getProperties()->setProperty("Ice.Warn.Connections", "0"); + $thrower = allTests($communicator); $thrower->shutdown(); $communicator->destroy(); diff --git a/php/test/Ice/exceptions/run.py b/php/test/Ice/exceptions/run.py index 87476ada6d2..9c5846ff6b0 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(additionalClientOptions="--Ice.Warn.Connections=0") +TestUtil.clientServerTest() print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat --Ice.Warn.Connections=0", +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 --Ice.Warn.Connections=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", additionalClientOptions="--Ice.Warn.Connections=0") +TestUtil.clientServerTest(server="serveramd") print("Running test with sliced format and AMD server.") -TestUtil.clientServerTest(server="serveramd", - additionalClientOptions="--Ice.Default.SlicedFormat --Ice.Warn.Connections=0", +TestUtil.clientServerTest(server="serveramd", + additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat") print("Running test with 1.0 encoding and AMD server.") -TestUtil.clientServerTest(server="serveramd", - additionalClientOptions="--Ice.Default.EncodingVersion=1.0 --Ice.Warn.Connections=0", +TestUtil.clientServerTest(server="serveramd", + additionalClientOptions="--Ice.Default.EncodingVersion=1.0", additionalServerOptions="--Ice.Default.EncodingVersion=1.0") |