summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-04-16 10:26:20 -0400
committerJoe George <joe@zeroc.com>2015-04-16 10:42:03 -0400
commitde6febc64288f96e07814ccaa5a5c16a414415e4 (patch)
tree8c6b945f9d0533cb2baf506b1989a884ef0b7011 /scripts/TestUtil.py
parentUpdate ZeroC homepage URLs (diff)
downloadice-de6febc64288f96e07814ccaa5a5c16a414415e4.tar.bz2
ice-de6febc64288f96e07814ccaa5a5c16a414415e4.tar.xz
ice-de6febc64288f96e07814ccaa5a5c16a414415e4.zip
Hashpassword changes
- Rename to icehashpassword.py - Use chosen passlib scheme's min/max rounds and salt size
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index ae87ebaaba8..f485cb4e45b 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -838,7 +838,7 @@ def getNodeCommand():
return nodeCmd
#
-# Create a passwords file that contains the given users/passwords using hashpassword.py
+# Create a passwords file that contains the given users/passwords using icehashpassword.py
#
def hashPasswords(filePath, entries):
if os.path.exists(filePath):
@@ -846,13 +846,13 @@ def hashPasswords(filePath, entries):
passwords = open(filePath, "a")
for user, password in entries.items():
p = subprocess.Popen(
- "%s %s" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "hashpassword.py"))),
+ "%s %s" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "icehashpassword.py"))),
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()
if(p.wait() != 0):
- print("hashpassword.py failed:\n" + p.stdout.read().decode('UTF-8').strip())
+ print("icehashpassword.py failed:\n" + p.stdout.read().decode('UTF-8').strip())
passwords.close()
sys.exit(1)
passwords.write("%s %s\n" % (user, p.stdout.readline().decode('UTF-8').strip()))