diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-04-28 22:32:02 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-04-28 22:32:02 +0200 |
| commit | 8fe52c0cd380c685040d95be59abba478b8fe6a9 (patch) | |
| tree | 18e0c1ded5f2c150607385f5ca1b0448debb4f60 /csharp/test | |
| parent | ICE-5865 Added license info to pom files (diff) | |
| download | ice-8fe52c0cd380c685040d95be59abba478b8fe6a9.tar.bz2 ice-8fe52c0cd380c685040d95be59abba478b8fe6a9.tar.xz ice-8fe52c0cd380c685040d95be59abba478b8fe6a9.zip | |
Fixed ICE-6464 and deprecated various IceSSL properties
Diffstat (limited to 'csharp/test')
| -rw-r--r-- | csharp/test/IceSSL/configuration/AllTests.cs | 7 | ||||
| -rwxr-xr-x | csharp/test/IceSSL/configuration/run.py | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/csharp/test/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs index d81617df54c..30b0a2bb476 100644 --- a/csharp/test/IceSSL/configuration/AllTests.cs +++ b/csharp/test/IceSSL/configuration/AllTests.cs @@ -2149,7 +2149,9 @@ public class AllTests for(int i = 0; i < clientFindCertProperties.Length; ++i) { initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", "cacert1"); - initData.properties.setProperty("IceSSL.FindCert.CurrentUser.My", clientFindCertProperties[i]); + initData.properties.setProperty("IceSSL.CertStore", "My"); + initData.properties.setProperty("IceSSL.CertStoreLocation", "CurrentUser"); + initData.properties.setProperty("IceSSL.FindCert", clientFindCertProperties[i]); // // Use TrustOnly to ensure the peer has pick the expected certificate. // @@ -2158,6 +2160,7 @@ public class AllTests Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); d = createServerProps(defaultProperties, defaultDir, defaultHost, "", "cacert1"); + // Use deprecated property here to test it d["IceSSL.FindCert.CurrentUser.My"] = serverFindCertProperties[i]; // // Use TrustOnly to ensure the peer has pick the expected certificate. @@ -2185,7 +2188,7 @@ public class AllTests try { initData = createClientProps(defaultProperties, defaultDir, defaultHost); - initData.properties.setProperty("IceSSL.FindCert.CurrentUser.My", s); + initData.properties.setProperty("IceSSL.FindCert", s); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); test(false); } diff --git a/csharp/test/IceSSL/configuration/run.py b/csharp/test/IceSSL/configuration/run.py index 60bb03f8c86..59a97dd0550 100755 --- a/csharp/test/IceSSL/configuration/run.py +++ b/csharp/test/IceSSL/configuration/run.py @@ -8,7 +8,7 @@ # # ********************************************************************** -import os, sys, getopt +import os, sys, getopt, re path = [ ".", "..", "../..", "../../..", "../../../.." ] head = os.path.dirname(sys.argv[0]) @@ -20,6 +20,9 @@ if len(path) == 0: sys.path.append(os.path.join(path[0], "scripts")) import TestUtil +# Filter-out the deprecated property warnings +TestUtil.clientTraceFilters = [ lambda x: re.sub("-! .* warning: deprecated property: IceSSL.FindCert.*\n", "", x) ] +TestUtil.serverTraceFilters = [ lambda x: re.sub("-! .* warning: deprecated property: IceSSL.FindCert.*\n", "", x) ] # # The drive letter needs to be removed on Windows or loading the SSL # plug-in will not work. |