wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 765015 - Don't stop server if it doesn't exist, r=jgriffin, DONTBUILD because NPOTB

Browse Source
This commit is contained in:
Andrew Halberstadt 2012-06-15 14:13:04 -07:00
parent 74559f9cee
commit 03af05e76c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testing/mochitest/runtestsb2g.py
View File

@ -9,6 +9,7 @@ import sys
import tempfile
import time
import urllib
import traceback
sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0]))))
@ -148,7 +149,7 @@ class B2GOptions(MochitestOptions):
options.sslPort = tempSSL
options.httpPort = tempPort
return options
return options
class ProfileConfigParser(ConfigParser.RawConfigParser):
@ -296,7 +297,8 @@ class B2GMochitest(Mochitest):
options.profilePath = remoteProfilePath
def stopWebServer(self, options):
self.server.stop()
if hasattr(self, 'server'):
self.server.stop()
def buildProfile(self, options):
if self.localProfile:
@ -437,6 +439,7 @@ def main():
retVal = mochitest.runTests(options)
except:
print "TEST-UNEXPECTED-FAIL | %s | Exception caught while running tests." % sys.exc_info()[1]
traceback.print_exc()
mochitest.stopWebServer(options)
mochitest.stopWebSocketServer(options)
try: