Bug 805116 - Print more of the logcat in mobile tests;r=gbrown

This commit is contained in:
William Lachance 2012-11-12 13:57:13 -08:00
parent be21d32089
commit 4a1fcf3f56
3 changed files with 10 additions and 6 deletions

View File

@ -13,6 +13,10 @@ import subprocess
from automation import Automation
from devicemanager import NetworkTools, DMError
# signatures for logcat messages that we don't care about much
fennecLogcatFilters = [ "The character encoding of the HTML document was not declared",
"Use of Mutation Events is deprecated. Use MutationObserver instead." ]
class RemoteAutomation(Automation):
_devicemanager = None

View File

@ -15,7 +15,7 @@ from runreftest import RefTest
from runreftest import ReftestOptions
from automation import Automation
import devicemanager, devicemanagerADB, devicemanagerSUT
from remoteautomation import RemoteAutomation
from remoteautomation import RemoteAutomation, fennecLogcatFilters
class RemoteOptions(ReftestOptions):
def __init__(self, automation):
@ -450,8 +450,8 @@ def main(args):
reftest.stopWebServer(options)
try:
logcat = dm.getLogcat()
print ''.join(logcat[-500:-1])
logcat = dm.getLogcat(filterOutRegexps=fennecLogcatFilters)
print ''.join(logcat)
print dm.getInfo()
except devicemanager.DMError:
print "WARNING: Error getting device information at end of test"

View File

@ -12,7 +12,7 @@ import traceback
sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0]))))
from automation import Automation
from remoteautomation import RemoteAutomation
from remoteautomation import RemoteAutomation, fennecLogcatFilters
from runtests import Mochitest
from runtests import MochitestOptions
from runtests import MochitestServer
@ -535,8 +535,8 @@ def main():
retVal = 1
try:
logcat = dm.getLogcat()
print ''.join(logcat[-500:-1])
logcat = dm.getLogcat(filterOutRegexps=fennecLogcatFilters)
print ''.join(logcat)
print dm.getInfo()
except devicemanager.DMError:
print "WARNING: Error getting device information at end of test"