Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 11:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 553922 - Update remote test code to have MPL header and use devicemanager timeout properly (NPOTB) r=ctalbert

Browse Source
This commit is contained in:
Joel Maher 2010-03-24 10:51:17 -07:00
parent caca3759df
commit e64d339c02
2 changed files with 94 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
layout/tools/reftest/remotereftest.py
View File

@ -1,3 +1,40 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Joel Maher.
#
# Portions created by the Initial Developer are Copyright (C) 2010
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Joel Maher <joel.maher@gmail.com> (Original Developer)
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
import sys
import os
import time
@ -53,7 +90,9 @@ class RemoteAutomation(Automation):
print "going to launch process: " + str(self.dm.host)
self.proc = dm.launchProcess(cmd)
self.procName = appName
self.timeout = 600
# Setting this at 1 hour since remote testing is much slower
self.timeout = 3600
time.sleep(5)
@property
@ -67,15 +106,18 @@ class RemoteAutomation(Automation):
def stdout(self):
return self.dm.getFile(self.proc)
def wait(self):
def wait(self, timeout = None):
timer = 0
if timeout == None:
timeout = self.timeout
while (self.dm.process.isAlive()):
time.sleep(1)
timer += 1
if (timer > self.timeout):
if (timer > timeout):
break
if (timer >= self.timeout):
if (timer >= timeout):
return 1
return 0

53
testing/mochitest/runtestsremote.py
View File

@ -1,3 +1,40 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Joel Maher.
#
# Portions created by the Initial Developer are Copyright (C) 2010
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Joel Maher <joel.maher@gmail.com> (Original Developer)
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
import sys
import os
import time
@ -53,7 +90,9 @@ class RemoteAutomation(Automation):
exepath = cmd[0]
name = exepath.split('/')[-1]
self.procName = name
self.timeout = 600
# Setting timeout at 1 hour since on a remote device this takes much longer
self.timeout = 3600
time.sleep(5)
@property
@ -67,15 +106,19 @@ class RemoteAutomation(Automation):
def stdout(self):
return self.dm.getFile(self.proc)
def wait(self):
def wait(self, timeout = None):
timer = 0
if timeout == None:
timeout = self.timeout
while (self.dm.process.isAlive()):
time.sleep(1)
timer += 1
if (timer > self.timeout):
if (timer > timeout):
break
if (timer >= self.timeout):
if (timer >= timeout):
return 1
return 0
@ -146,8 +189,8 @@ class RemoteOptions(MochitestOptions):
tempSSL = options.sslPort
options = MochitestOptions.verifyOptions(self, options, mochitest)
options.app = temp
options.httpPort = tempPort
options.sslPort = tempSSL
options.httpPort = tempPort
if (options.remoteWebServer == None):
print "ERROR: you must provide a remote webserver ip address"