mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 912779 - Improve error handling in mochitest runtestsremote.py; r=jmaher
This commit is contained in:
parent
fdac6d9380
commit
83a1ba3fdd
@ -313,9 +313,10 @@ class MochiRemote(Mochitest):
|
|||||||
|
|
||||||
xpcshell_path = os.path.join(options.utilityPath, xpcshell)
|
xpcshell_path = os.path.join(options.utilityPath, xpcshell)
|
||||||
if localAutomation.elf_arm(xpcshell_path):
|
if localAutomation.elf_arm(xpcshell_path):
|
||||||
self.error('xpcshell at %s is an ARM binary; please use '
|
log.error('xpcshell at %s is an ARM binary; please use '
|
||||||
'the --utility-path argument to specify the path '
|
'the --utility-path argument to specify the path '
|
||||||
'to a desktop version.' % xpcshell)
|
'to a desktop version.' % xpcshell_path)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
options.profilePath = tempfile.mkdtemp()
|
options.profilePath = tempfile.mkdtemp()
|
||||||
self.server = MochitestServer(localAutomation, options)
|
self.server = MochitestServer(localAutomation, options)
|
||||||
@ -332,7 +333,8 @@ class MochiRemote(Mochitest):
|
|||||||
options.profilePath = remoteProfilePath
|
options.profilePath = remoteProfilePath
|
||||||
|
|
||||||
def stopWebServer(self, options):
|
def stopWebServer(self, options):
|
||||||
self.server.stop()
|
if hasattr(self, 'server'):
|
||||||
|
self.server.stop()
|
||||||
|
|
||||||
def buildProfile(self, options):
|
def buildProfile(self, options):
|
||||||
if self.localProfile:
|
if self.localProfile:
|
||||||
|
Loading…
Reference in New Issue
Block a user