diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-09 11:12:16 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-09 11:12:16 +0100 |
| commit | 27f45794866bc600abcc3aa6207e0468660f908d (patch) | |
| tree | 4b9ff5f33b84948a01258d8008b743fbc4013a18 /scripts/tests/IceSSL/configuration.py | |
| parent | Renamed Slice/keyword test to clash, and added identifier-clash test (diff) | |
| download | ice-27f45794866bc600abcc3aa6207e0468660f908d.tar.bz2 ice-27f45794866bc600abcc3aa6207e0468660f908d.tar.xz ice-27f45794866bc600abcc3aa6207e0468660f908d.zip | |
Added support for SSL with automated UWP tests
Diffstat (limited to 'scripts/tests/IceSSL/configuration.py')
| -rw-r--r-- | scripts/tests/IceSSL/configuration.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/tests/IceSSL/configuration.py b/scripts/tests/IceSSL/configuration.py index 7c951fa8bd5..fbd0d5bb64f 100644 --- a/scripts/tests/IceSSL/configuration.py +++ b/scripts/tests/IceSSL/configuration.py @@ -48,7 +48,12 @@ class ConfigurationTestCase(ClientServerTestCase): # Filter-out the deprecated property warnings outfilters = [ lambda x: re.sub("-! .* warning: deprecated property: IceSSL.KeyFile\n", "", x) ] +# +# With UWP, we can't run this test with the UWP C++ server (used with tcp/ws) +# +options=lambda current: { "protocol": ["ssl", "wss"] } if current.config.uwp else {} + TestSuite(__name__, [ ConfigurationTestCase(client=Client(outfilters=outfilters, args=['"{testdir}"']), - server=Server(outfilters=outfilters)) -], multihost=False) + server=Server(outfilters=outfilters, args=['"{testdir}"'])) +], multihost=False, options=options) |