summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-10-03 15:42:09 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-10-03 15:42:09 +0200
commit4eb379cee4bc5abb2a6dc622de760c94625ed960 (patch)
tree010e5743c496e2df95ed44ed9664d572d53e6aba
parentFix for 7406 and issue with space in path passed to icehashpassword.py (diff)
downloadice-4eb379cee4bc5abb2a6dc622de760c94625ed960.tar.bz2
ice-4eb379cee4bc5abb2a6dc622de760c94625ed960.tar.xz
ice-4eb379cee4bc5abb2a6dc622de760c94625ed960.zip
Fixed hashpassword test to better deal with spaces in path
-rwxr-xr-xcpp/test/Glacier2/hashpassword/run.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Glacier2/hashpassword/run.py b/cpp/test/Glacier2/hashpassword/run.py
index db973eb0d0f..7abe7831eec 100755
--- a/cpp/test/Glacier2/hashpassword/run.py
+++ b/cpp/test/Glacier2/hashpassword/run.py
@@ -27,8 +27,8 @@ def test(b):
raise RuntimeError('test assertion failed')
def hashPasswords(password, args = ""):
- p = subprocess.Popen("%s %s %s" % (sys.executable, hashpassword, args), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
- stdin=subprocess.PIPE)
+ p = subprocess.Popen('%s "%s" %s' % (sys.executable, hashpassword, args), shell=True, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT, stdin=subprocess.PIPE)
p.stdin.write(password.encode('UTF-8'))
p.stdin.write('\r\n'.encode('UTF-8'))
p.stdin.flush()