Skip to content

Commit

Permalink
Renamed SSL to TLS in new and updated files
Browse files Browse the repository at this point in the history
There are still many references to "SSL" in other files
  • Loading branch information
ckunki committed Jul 8, 2024
1 parent 9047cf7 commit 60f80d9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions exasol_python_test_framework/exatest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def _parse_opts(self):
logdir='.',
loglevel='warning',
odbc_log='off',
ssl_cert='unverified',
tls_cert='unverified',
connect=None,
driver=None,
debugger=False,
Expand Down Expand Up @@ -290,7 +290,7 @@ def _main(self):
self.opts.user,
self.opts.password,
self.opts.odbc_log,
self.opts.ssl_cert,
self.opts.tls_cert,
)
prepare_ok = self.prepare_hook()
self.opts.log.info('starting tests')
Expand Down
16 changes: 8 additions & 8 deletions exasol_python_test_framework/exatest/clients/client_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"verbose": "VERBOSE",
}

SSL_CERT_OPTIONS = {
TLS_CERT_OPTIONS = {
"verify": None,
"unverified": "SSL_VERIFY_NONE",
}
Expand Down Expand Up @@ -62,14 +62,14 @@ def odbc_arguments(self, parser):
help='activate ODBC driver log (default: %(default)s)',
)
parser.add_argument(
"--ssl-cert", choices=SSL_CERT_OPTIONS,
help='SSL certificate verification (default: %(default)s)',
"--tls-cert", choices=TLS_CERT_OPTIONS,
help='TLS certificate verification (default: %(default)s)',
)
return parser

def _write_odbcini(self, log_path, server, driver,
user, password, odbc_log,
ssl_cert) -> str:
tls_cert) -> str:
def cleandoc_nl(string):
return cleandoc(string) + "\n"

Expand All @@ -91,8 +91,8 @@ def cleandoc_nl(string):
CONNECTIONLCNUMERIC = en_US.UTF-8
"""
))
if ssl_cert != "verify":
file.write(f"SSLCERTIFICATE = {SSL_CERT_OPTIONS[ssl_cert]}\n")
if tls_cert != "verify":
file.write(f"SSLCERTIFICATE = {TLS_CERT_OPTIONS[tls_cert]}\n")
if odbc_log != "off":
file.write(cleandoc_nl(
f"""
Expand All @@ -110,7 +110,7 @@ def prepare_odbc_init(
user,
password,
odbc_log,
ssl_cert = "unverified",
tls_cert = "unverified",
):
path = self._write_odbcini(
log_path,
Expand All @@ -119,6 +119,6 @@ def prepare_odbc_init(
user,
password,
odbc_log,
ssl_cert,
tls_cert,
)
os.environ[ENV_VAR] = path

0 comments on commit 60f80d9

Please sign in to comment.