summaryrefslogtreecommitdiff
path: root/csharp/test
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-06-15 20:07:33 +0200
committerJose <jose@zeroc.com>2015-06-15 20:07:33 +0200
commit401cab1f701aa1ddd319c2068c0f802fcc992f5c (patch)
treeb03d26a350ddabbd55843353fcb09d98f51bd8e9 /csharp/test
parentDon't throw RetryException if the failure occurs during connection establishe... (diff)
downloadice-401cab1f701aa1ddd319c2068c0f802fcc992f5c.tar.bz2
ice-401cab1f701aa1ddd319c2068c0f802fcc992f5c.tar.xz
ice-401cab1f701aa1ddd319c2068c0f802fcc992f5c.zip
Fix to run browser tests with CSharp servers
Diffstat (limited to 'csharp/test')
-rwxr-xr-xcsharp/test/Ice/exceptions/run.py28
1 files changed, 24 insertions, 4 deletions
diff --git a/csharp/test/Ice/exceptions/run.py b/csharp/test/Ice/exceptions/run.py
index 49048adf651..57808be6caf 100755
--- a/csharp/test/Ice/exceptions/run.py
+++ b/csharp/test/Ice/exceptions/run.py
@@ -20,9 +20,29 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with regular server.")
-TestUtil.clientServerTest(additionalClientOptions=" --Ice.Warn.Connections=0")
-print("tests with AMD server.")
+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")
+
+print("Running test with 1.0 encoding.")
+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")
-print("tests with collocated server.")
+
+print("Running test with sliced format and AMD server.")
+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",
+ additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+
+print("Running collocated test.")
TestUtil.collocatedTest()