mirror of
https://github.com/mongodb/mongo.git
synced 2024-11-30 09:06:21 +01:00
Tweaks to smoke.py. SERVER-253
This commit is contained in:
parent
b7feb6af29
commit
f9bba9c120
@ -42,7 +42,6 @@ class mongod(object):
|
||||
print >> sys.stderr, e
|
||||
return not isinstance(value, Exception)
|
||||
|
||||
|
||||
def ensureTestDirs(self):
|
||||
utils.ensureDir( "/tmp/unittest/" )
|
||||
utils.ensureDir( "/data/" )
|
||||
@ -86,11 +85,13 @@ class mongod(object):
|
||||
# return startMongodWithArgs("--master", "--oplogSize", "10")
|
||||
|
||||
def stop(self):
|
||||
print "FOO"
|
||||
if not self.proc:
|
||||
print >> sys.stderr, "probable bug: self.proc unset in stop()"
|
||||
return
|
||||
if self.proc.poll() is not None:
|
||||
raise Exception( "Failed to start mongod" )
|
||||
# ???
|
||||
#if self.proc.poll() is not None:
|
||||
# raise Exception( "Failed to start mongod" )
|
||||
try:
|
||||
# This function not available in Python 2.5
|
||||
self.proc.terminate()
|
||||
@ -135,8 +136,9 @@ def runTest(path):
|
||||
print " *******************************************"
|
||||
print " Test : " + os.path.basename(path) + " ..."
|
||||
t1=time.time()
|
||||
p = Popen(argv)
|
||||
r = p.wait()
|
||||
# FIXME: we don't handle the case where the subprocess
|
||||
# hangs... that's bad.
|
||||
r = call(argv)
|
||||
t2=time.time()
|
||||
print " " + str((t2-t1)*1000) + "ms"
|
||||
if r != 0:
|
||||
|
Loading…
Reference in New Issue
Block a user