Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1596 from yurydelendik/tests-kill-browser

Browse Source 
Terminates browser processes; if killed waits for termination
This commit is contained in:
Artur Adib 2012-04-24 12:07:17 -07:00
commit c933845320
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/test.py
View File

@ -292,6 +292,8 @@ class BaseBrowserCommand(object):
self.browserLog = open(BROWSERLOG_FILE, "w") self.browserLog = open(BROWSERLOG_FILE, "w")
def teardown(self): def teardown(self):
self.process.terminate()
# If the browser is still running, wait up to ten seconds for it to quit # If the browser is still running, wait up to ten seconds for it to quit
if self.process and self.process.poll() is None: if self.process and self.process.poll() is None:
checks = 0 checks = 0
@ -302,6 +304,7 @@ class BaseBrowserCommand(object):
if self.process.poll() is None: if self.process.poll() is None:
print "Process %s is still running. Killing." % self.name print "Process %s is still running. Killing." % self.name
self.process.kill() self.process.kill()
self.process.wait()
if self.tempDir is not None and os.path.exists(self.tempDir): if self.tempDir is not None and os.path.exists(self.tempDir):
shutil.rmtree(self.tempDir) shutil.rmtree(self.tempDir)