From 4cff265a9f58c9859816eb288a0c7d983997f4be Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Tue, 3 Mar 2020 18:45:23 +0100 Subject: [PATCH] NEO: safer quotes in runTestSuite --- software/neoppod/buildout.hash.cfg | 2 +- software/neoppod/runTestSuite.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/software/neoppod/buildout.hash.cfg b/software/neoppod/buildout.hash.cfg index 3a29c0024..c7d83e4e9 100644 --- a/software/neoppod/buildout.hash.cfg +++ b/software/neoppod/buildout.hash.cfg @@ -46,4 +46,4 @@ md5sum = 5afd326de385563b5aeac81039f23341 [runTestSuite.in] _update_hash_filename_ = runTestSuite.in -md5sum = 6f60a4804dc3749d0fd2997ca4a33cc9 +md5sum = d724ca0d54dda15bba68b8a87f0e4544 diff --git a/software/neoppod/runTestSuite.in b/software/neoppod/runTestSuite.in index e5e529de2..da789ebe0 100644 --- a/software/neoppod/runTestSuite.in +++ b/software/neoppod/runTestSuite.in @@ -13,12 +13,12 @@ SUMMARY_RE = re.compile( r' (.*) (?P<duration>\d+(\.\d*)?|\.\d+)s', re.MULTILINE) PATH = os.environ['PATH'] -PATH = '{{ prepend_path }}' + (PATH and ':' + PATH) +PATH = {{ repr(prepend_path) }} + (PATH and ':' + PATH) # NEO specific environment -TEMP_DIRECTORY = '{{directory.tmp}}' -NEO_DB_SOCKET = '{{my_cnf_parameters.socket}}' -RUN_NEO_TESTS_COMMAND = '{{ bin_directory }}/neotestrunner' +TEMP_DIRECTORY = {{ repr(directory.tmp) }} +NEO_DB_SOCKET = {{ repr(my_cnf_parameters.socket) }} +RUN_NEO_TESTS_COMMAND = {{ repr(bin_directory + '/neotestrunner') }} def parseTestStdOut(data): """ -- 2.30.9