summaryrefslogtreecommitdiff
path: root/buildscripts/smoke.py
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2012-01-24 00:14:53 -0500
committerEliot Horowitz <eliot@10gen.com>2012-01-24 00:14:53 -0500
commitd9b74dc7cf8c7cd9279281aa5ea8707e8e48e24a (patch)
tree449b6d0f7c5f69740ce85971afb307360140bd56 /buildscripts/smoke.py
parent6a4d7740f6ab1d81937d833c7d9d1f66f8992602 (diff)
downloadmongo-d9b74dc7cf8c7cd9279281aa5ea8707e8e48e24a.tar.gz
really fix smoke.py...
Diffstat (limited to 'buildscripts/smoke.py')
-rwxr-xr-xbuildscripts/smoke.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index 01173a6cf2c..c598ef52b48 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -316,6 +316,8 @@ def runTest(test):
f = open(keyFile, 'r')
keyFileData = re.sub(r'\s', '', f.read()) # Remove all whitespace
f.close()
+ else:
+ keyFileData = None
sys.stderr.write( "starting test : %s \n" % os.path.basename(path) )
sys.stderr.flush()
@@ -332,7 +334,7 @@ def runTest(test):
'TestData.noJournalPrealloc = ' + ternary( no_preallocj ) + ";" + \
'TestData.auth = ' + ternary( auth ) + ";" + \
'TestData.keyFile = ' + ternary( keyFile , '"' + str(keyFile) + '"' , 'null' ) + ";" + \
- 'TestData.keyFileData = ' + ( keyFile , '"' + str(keyFileData) + '"' , 'null' ) + ";"
+ 'TestData.keyFileData = ' + ternary( keyFile , '"' + str(keyFileData) + '"' , 'null' ) + ";"
if auth and usedb:
evalString += 'db.getSiblingDB("admin").addUser("admin","password");'
evalString += 'jsTest.authenticate(db.getMongo());'