Commit 27bd5361 authored by Łukasz Nowak's avatar Łukasz Nowak

_testSQLBench: Use upcoming key from SlapOS

SlapOS will publish directly SLAPOS_SOFTWARE_HOME in environment, so
start using it, with fetching old OPENSSL_BINARY as fallback.
parent 74ee68f5
...@@ -43,8 +43,10 @@ class TestSQLBench(unittest.TestCase): ...@@ -43,8 +43,10 @@ class TestSQLBench(unittest.TestCase):
sql_connection_string = os.environ['erp5_sql_connection_string'] sql_connection_string = os.environ['erp5_sql_connection_string']
database_and_server, user, password = sql_connection_string.split(' ') database_and_server, user, password = sql_connection_string.split(' ')
database, host = database_and_server.split('@') database, host = database_and_server.split('@')
software_home = os.environ['OPENSSL_BINARY'].replace( software_home = os.environ.get(
"parts/openssl/bin/openssl", "") 'SLAPOS_SOFTWARE_HOME', # new SlapOS key
os.environ['OPENSSL_BINARY'].replace( # BBB for old SlapOS key
"parts/openssl/bin/openssl", ""))
mariadb_folder = software_home + '/parts/mariadb' mariadb_folder = software_home + '/parts/mariadb'
perl_command = software_home + "/parts/perl/bin/perl" perl_command = software_home + "/parts/perl/bin/perl"
command_list = [perl_command, command_list = [perl_command,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment