diff options
| author | Jose <jose@zeroc.com> | 2017-04-27 14:05:32 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-04-27 14:05:32 +0200 |
| commit | 9ac69dd6ef84a5173be4ccb0c97bab54eb16b79e (patch) | |
| tree | d1ece7d2fd3aacf96542307b2eef190d79a42322 /scripts/tests | |
| parent | Filter out ruby test on Windows (diff) | |
| download | ice-9ac69dd6ef84a5173be4ccb0c97bab54eb16b79e.tar.bz2 ice-9ac69dd6ef84a5173be4ccb0c97bab54eb16b79e.tar.xz ice-9ac69dd6ef84a5173be4ccb0c97bab54eb16b79e.zip | |
Fix for OpenSSL IceSSL/configuration test on Windows
Diffstat (limited to 'scripts/tests')
| -rw-r--r-- | scripts/tests/IceSSL/configuration.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/tests/IceSSL/configuration.py b/scripts/tests/IceSSL/configuration.py index 0f8939997f4..b99101216c3 100644 --- a/scripts/tests/IceSSL/configuration.py +++ b/scripts/tests/IceSSL/configuration.py @@ -31,7 +31,7 @@ class ConfigurationTestCase(ClientServerTestCase): for c in ["cacert1.pem", "cacert2.pem"]: pem = os.path.join(certsPath, c) out = run("{openssl} x509 -subject_hash -noout -in {pem}".format(pem=pem, openssl=self.getOpenSSLCommand())) - shutil.copyfile(pem, "{dir}/{out}.0".format(dir=certsPath, out=out)) + shutil.copyfile(pem, "{dir}/{out}.0".format(dir=certsPath, out=out.splitlines()[0])) def teardownServerSide(self, current, success): # Nothing to do if we're not running this test with the C++ mapping @@ -45,7 +45,7 @@ class ConfigurationTestCase(ClientServerTestCase): for c in ["cacert1.pem", "cacert2.pem"]: pem = os.path.join(certsPath, c) out = run("{openssl} x509 -subject_hash -noout -in {pem}".format(pem=pem, openssl=self.getOpenSSLCommand())) - os.remove("{dir}/{out}.0".format(out=out, dir=certsPath)) + os.remove("{dir}/{out}.0".format(out=out.splitlines()[0], dir=certsPath)) def getOpenSSLCommand(self): if isinstance(platform, Windows): |