diff options
| author | Jose <jose@zeroc.com> | 2015-06-15 20:07:33 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-06-15 20:07:33 +0200 |
| commit | 401cab1f701aa1ddd319c2068c0f802fcc992f5c (patch) | |
| tree | b03d26a350ddabbd55843353fcb09d98f51bd8e9 | |
| parent | Don't throw RetryException if the failure occurs during connection establishe... (diff) | |
| download | ice-401cab1f701aa1ddd319c2068c0f802fcc992f5c.tar.bz2 ice-401cab1f701aa1ddd319c2068c0f802fcc992f5c.tar.xz ice-401cab1f701aa1ddd319c2068c0f802fcc992f5c.zip | |
Fix to run browser tests with CSharp servers
| -rwxr-xr-x | csharp/test/Ice/exceptions/run.py | 28 | ||||
| -rw-r--r-- | java/test/controller/src/main/java/Test/Common/ControllerServer.java | 2 | ||||
| -rw-r--r-- | js/test/Common/index.html | 6 |
3 files changed, 29 insertions, 7 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() diff --git a/java/test/controller/src/main/java/Test/Common/ControllerServer.java b/java/test/controller/src/main/java/Test/Common/ControllerServer.java index d5ffbd32dee..a44252a3ad9 100644 --- a/java/test/controller/src/main/java/Test/Common/ControllerServer.java +++ b/java/test/controller/src/main/java/Test/Common/ControllerServer.java @@ -47,6 +47,8 @@ public class ControllerServer extends Ice.Application { if(line.matches(Pattern.quote("starting server...") + ".*ok") || line.matches(Pattern.quote("starting serveramd...") + ".*ok") || + line.matches(Pattern.quote("starting servertie...") + ".*ok") || + line.matches(Pattern.quote("starting serveramdtie...") + ".*ok") || line.matches("starting test.*" + Pattern.quote("Server...") + ".*ok")) { synchronized(ServerI.this) diff --git a/js/test/Common/index.html b/js/test/Common/index.html index 0c2fac7bab1..071fad10be1 100644 --- a/js/test/Common/index.html +++ b/js/test/Common/index.html @@ -49,7 +49,7 @@ <select id="language"> <option value="cpp">C++</option> <option value="java">Java</option> - <option value="cs">C#</option> + <option value="csharp">C#</option> </select> </div> </div> @@ -202,10 +202,10 @@ name: "AMD server" }, { - name: "TIE server", langs: ["java", "C#"] + name: "TIE server", langs: ["java", "csharp"] }, { - name: "AMD TIE server", langs: ["java", "C#"] + name: "AMD TIE server", langs: ["java", "csharp"] } ] }, |