diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-05-28 12:01:49 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-05-28 12:01:49 +0200 |
| commit | f6854c7133fb10e2217b7ff79e577f6e98ca6b2d (patch) | |
| tree | 19e2e025b2c5c82b1c56f60bf5d9440feb1288d2 | |
| parent | Removed prepublish hook which doesn't work on Windows (diff) | |
| download | ice-f6854c7133fb10e2217b7ff79e577f6e98ca6b2d.tar.bz2 ice-f6854c7133fb10e2217b7ff79e577f6e98ca6b2d.tar.xz ice-f6854c7133fb10e2217b7ff79e577f6e98ca6b2d.zip | |
IceGrid/session test doesn't support running with wss (ICE-6539)
| -rwxr-xr-x | cpp/allTests.py | 4 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/Server.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/application.xml | 4 | ||||
| -rwxr-xr-x | scripts/TestUtil.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py index 0450e42b3fc..1d192b5be8b 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -24,7 +24,7 @@ import TestUtil # # List of all basic tests. # -tests = [ +tests = [ ("IceUtil/condvar", ["once", "win32only"]), ("IceUtil/thread", ["once"]), ("IceUtil/unicode", ["once"]), @@ -98,7 +98,7 @@ tests = [ ("IceGrid/simple", ["service", "novc100", "nomingw"]), ("IceGrid/fileLock", ["service", "novc100", "nomingw"]), ("IceGrid/deployer", ["service", "novc100", "nomingw"]), - ("IceGrid/session", ["service", "novc100", "nomingw"]), + ("IceGrid/session", ["service", "novc100", "nomingw", "nows"]), ("IceGrid/update", ["service", "novc100", "nomingw"]), ("IceGrid/noRestartUpdate", ["service", "novc100", "nomingw"]), ("IceGrid/activation", ["service", "novc100", "nomingw"]), diff --git a/cpp/test/IceGrid/session/Server.cpp b/cpp/test/IceGrid/session/Server.cpp index 21b3d285e9b..cc8d6b137ab 100644 --- a/cpp/test/IceGrid/session/Server.cpp +++ b/cpp/test/IceGrid/session/Server.cpp @@ -41,7 +41,7 @@ public: { throw Test::ExtendedPermissionDeniedException("reason"); } - + test(info.certs.size() > 0); IceSSL::CertificatePtr cert = IceSSL::Certificate::decode(info.certs[0]); test(cert->getIssuerDN() == IceSSL::DistinguishedName( "emailAddress=info@zeroc.com,C=US,ST=Florida,L=Jupiter,O=ZeroC\\, Inc.,OU=Ice,CN=Ice Tests CA")); diff --git a/cpp/test/IceGrid/session/application.xml b/cpp/test/IceGrid/session/application.xml index a4b7bcf56e1..fa5a105bca3 100644 --- a/cpp/test/IceGrid/session/application.xml +++ b/cpp/test/IceGrid/session/application.xml @@ -12,7 +12,7 @@ <server id="${id}" exe="${ice.bindir}/glacier2router"> <property name="Glacier2.Client.Endpoints" value="${endpoints}"/> <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/> - + <property name="Glacier2.SessionManager" value="${manager}"/> <property name="Glacier2.SSLSessionManager" value="${ssl-manager}"/> <property name="Glacier2.PermissionsVerifier" value="${verifier}"/> @@ -33,7 +33,7 @@ verifier="AdminPermissionsVerifier:tcp -p 12002" manager="TestIceGrid/AdminSessionManager" ssl-manager="TestIceGrid/AdminSSLSessionManager"/> - + <server id="PermissionsVerifierServer" exe="${test.dir}/server" activation="on-demand"> <adapter name="Server" endpoints="default -h 127.0.0.1"> <object identity="ClientPermissionsVerifier"/> diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index f2a2135de79..d4d533ca67b 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -566,7 +566,7 @@ def run(tests, root = False): expanded.append([ (test, a, config) for test,config in tests if "service" in config]) if not noipv6: - a = "--ipv6 --protocol=wss --compress --mx --serialize %s" % arg + a = "--ipv6 --protocol=ssl --compress --mx --serialize %s" % arg expanded.append([ (test, a, config) for test,config in tests if "service" in config]) elif not allCross: |