2012-05-21 04:12:37 -07:00
|
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
2010-06-24 02:32:01 -07:00
|
|
|
|
|
|
|
import time
|
2012-11-02 11:57:50 -07:00
|
|
|
import re
|
2010-06-24 02:32:01 -07:00
|
|
|
import os
|
2011-10-06 07:51:03 -07:00
|
|
|
import tempfile
|
|
|
|
import shutil
|
2012-08-14 07:41:11 -07:00
|
|
|
import subprocess
|
2010-06-24 02:32:01 -07:00
|
|
|
|
|
|
|
from automation import Automation
|
Bug 795496 - Make mozdevice raise exceptions on error;r=ahal,jmaher
It turns out that relying on the user to check return codes for every
command was non-intuitive and resulted in many hard to trace bugs.
Now most functinos just return "None", and raise a DMError when there's an
exception. The exception to this are functions like dirExists, which now return
booleans, and throw exceptions on error. This is a fairly major refactor,
and also involved the following internal changes:
* Removed FileError and AgentError exceptions, replaced with DMError
(having to manage three different types of exceptions was confusing,
all the more so when we're raising them)
* Docstrings updated to remove references to return values where no
longer relevant
* pushFile no longer will create a directory to accomodate the file
if it doesn't exist (this makes it consistent with devicemanagerADB)
* dmSUT we validate the file, but assume that we get something back
from the agent, instead of falling back to manual validation in the
case that we didn't
* isDir and dirExists had the same intention, but different
implementations for dmSUT. Replaced the dmSUT impl of getDirectory
with that of isDir's (which was much simpler). Removed
isDir from devicemanager.py, since it wasn't used externally
* killProcess modified to check for process existence before running
(since the actual internal kill command will throw an exception
if the process doesn't exist)
In addition to all this, more unit tests have been added to test these
changes for devicemanagerSUT.
2012-10-04 08:28:07 -07:00
|
|
|
from devicemanager import NetworkTools, DMError
|
2010-06-24 02:32:01 -07:00
|
|
|
|
2012-11-12 13:57:13 -08:00
|
|
|
# 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." ]
|
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
class RemoteAutomation(Automation):
|
|
|
|
_devicemanager = None
|
2012-08-14 07:41:11 -07:00
|
|
|
|
2010-09-17 17:18:06 -07:00
|
|
|
def __init__(self, deviceManager, appName = '', remoteLog = None):
|
2010-06-24 02:32:01 -07:00
|
|
|
self._devicemanager = deviceManager
|
|
|
|
self._appName = appName
|
|
|
|
self._remoteProfile = None
|
2010-09-17 17:18:06 -07:00
|
|
|
self._remoteLog = remoteLog
|
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
# Default our product to fennec
|
|
|
|
self._product = "fennec"
|
2012-11-02 11:57:50 -07:00
|
|
|
self.lastTestSeen = "remoteautomation.py"
|
2010-06-24 02:32:01 -07:00
|
|
|
Automation.__init__(self)
|
|
|
|
|
|
|
|
def setDeviceManager(self, deviceManager):
|
|
|
|
self._devicemanager = deviceManager
|
2012-08-14 07:41:11 -07:00
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
def setAppName(self, appName):
|
|
|
|
self._appName = appName
|
|
|
|
|
|
|
|
def setRemoteProfile(self, remoteProfile):
|
|
|
|
self._remoteProfile = remoteProfile
|
|
|
|
|
|
|
|
def setProduct(self, product):
|
|
|
|
self._product = product
|
2012-08-14 07:41:11 -07:00
|
|
|
|
2010-09-17 17:18:06 -07:00
|
|
|
def setRemoteLog(self, logfile):
|
|
|
|
self._remoteLog = logfile
|
2010-06-24 02:32:01 -07:00
|
|
|
|
2010-12-16 15:28:35 -08:00
|
|
|
# Set up what we need for the remote environment
|
|
|
|
def environment(self, env = None, xrePath = None, crashreporter = True):
|
|
|
|
# Because we are running remote, we don't want to mimic the local env
|
|
|
|
# so no copying of os.environ
|
|
|
|
if env is None:
|
|
|
|
env = {}
|
|
|
|
|
2011-07-26 16:13:20 -07:00
|
|
|
# Except for the mochitest results table hiding option, which isn't
|
|
|
|
# passed to runtestsremote.py as an actual option, but through the
|
|
|
|
# MOZ_CRASHREPORTER_DISABLE environment variable.
|
|
|
|
if 'MOZ_HIDE_RESULTS_TABLE' in os.environ:
|
|
|
|
env['MOZ_HIDE_RESULTS_TABLE'] = os.environ['MOZ_HIDE_RESULTS_TABLE']
|
|
|
|
|
2010-12-16 15:28:35 -08:00
|
|
|
if crashreporter:
|
|
|
|
env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
|
|
|
|
env['MOZ_CRASHREPORTER'] = '1'
|
|
|
|
else:
|
|
|
|
env['MOZ_CRASHREPORTER_DISABLE'] = '1'
|
|
|
|
|
|
|
|
return env
|
|
|
|
|
2012-11-02 11:57:50 -07:00
|
|
|
def waitForFinish(self, proc, utilityPath, timeout, maxTime, startTime, debuggerInfo, symbolsPath):
|
|
|
|
""" Wait for tests to finish (as evidenced by the process exiting),
|
|
|
|
or for maxTime elapse, in which case kill the process regardless.
|
|
|
|
"""
|
2010-06-24 02:32:01 -07:00
|
|
|
# maxTime is used to override the default timeout, we should honor that
|
|
|
|
status = proc.wait(timeout = maxTime)
|
2012-11-02 11:57:50 -07:00
|
|
|
self.lastTestSeen = proc.getLastTestSeen
|
2010-06-24 02:32:01 -07:00
|
|
|
|
2013-05-03 10:37:59 -07:00
|
|
|
if (status == 1 and self._devicemanager.getTopActivity() == proc.procName):
|
2010-06-24 02:32:01 -07:00
|
|
|
# Then we timed out, make sure Fennec is dead
|
2012-11-28 12:43:58 -08:00
|
|
|
if maxTime:
|
|
|
|
print "TEST-UNEXPECTED-FAIL | %s | application ran for longer than " \
|
|
|
|
"allowed maximum time of %s seconds" % (self.lastTestSeen, maxTime)
|
|
|
|
else:
|
|
|
|
print "TEST-UNEXPECTED-FAIL | %s | application ran for longer than " \
|
|
|
|
"allowed maximum time" % (self.lastTestSeen)
|
2010-06-24 02:32:01 -07:00
|
|
|
proc.kill()
|
|
|
|
|
|
|
|
return status
|
|
|
|
|
2013-02-13 10:42:15 -08:00
|
|
|
def checkForJavaException(self, logcat):
|
|
|
|
found_exception = False
|
|
|
|
for i, line in enumerate(logcat):
|
2013-05-14 11:08:47 -07:00
|
|
|
if "REPORTING UNCAUGHT EXCEPTION" in line or "FATAL EXCEPTION" in line:
|
2013-02-13 10:42:15 -08:00
|
|
|
# Strip away the date, time, logcat tag and pid from the next two lines and
|
|
|
|
# concatenate the remainder to form a concise summary of the exception.
|
|
|
|
#
|
|
|
|
# For example:
|
|
|
|
#
|
|
|
|
# 01-30 20:15:41.937 E/GeckoAppShell( 1703): >>> REPORTING UNCAUGHT EXCEPTION FROM THREAD 9 ("GeckoBackgroundThread")
|
|
|
|
# 01-30 20:15:41.937 E/GeckoAppShell( 1703): java.lang.NullPointerException
|
|
|
|
# 01-30 20:15:41.937 E/GeckoAppShell( 1703): at org.mozilla.gecko.GeckoApp$21.run(GeckoApp.java:1833)
|
|
|
|
# 01-30 20:15:41.937 E/GeckoAppShell( 1703): at android.os.Handler.handleCallback(Handler.java:587)
|
|
|
|
# 01-30 20:15:41.937 E/GeckoAppShell( 1703): at android.os.Handler.dispatchMessage(Handler.java:92)
|
|
|
|
# 01-30 20:15:41.937 E/GeckoAppShell( 1703): at android.os.Looper.loop(Looper.java:123)
|
|
|
|
# 01-30 20:15:41.937 E/GeckoAppShell( 1703): at org.mozilla.gecko.util.GeckoBackgroundThread.run(GeckoBackgroundThread.java:31)
|
|
|
|
#
|
|
|
|
# -> java.lang.NullPointerException at org.mozilla.gecko.GeckoApp$21.run(GeckoApp.java:1833)
|
|
|
|
found_exception = True
|
2013-05-17 04:42:02 -07:00
|
|
|
logre = re.compile(r".*\): \t?(.*)")
|
2013-02-13 10:42:15 -08:00
|
|
|
m = logre.search(logcat[i+1])
|
|
|
|
if m and m.group(1):
|
|
|
|
top_frame = m.group(1)
|
|
|
|
m = logre.search(logcat[i+2])
|
|
|
|
if m and m.group(1):
|
|
|
|
top_frame = top_frame + m.group(1)
|
|
|
|
print "PROCESS-CRASH | java-exception | %s" % top_frame
|
|
|
|
break
|
|
|
|
return found_exception
|
|
|
|
|
2013-05-16 13:32:52 -07:00
|
|
|
def deleteANRs(self):
|
|
|
|
# delete ANR traces.txt file; usually need root permissions
|
|
|
|
traces = "/data/anr/traces.txt"
|
|
|
|
try:
|
|
|
|
self._devicemanager.shellCheckOutput(['rm', traces], root=True)
|
|
|
|
except DMError:
|
|
|
|
print "Error deleting %s" % traces
|
|
|
|
pass
|
|
|
|
|
|
|
|
def checkForANRs(self):
|
|
|
|
traces = "/data/anr/traces.txt"
|
|
|
|
if self._devicemanager.fileExists(traces):
|
|
|
|
try:
|
|
|
|
t = self._devicemanager.pullFile(traces)
|
|
|
|
print "Contents of %s:" % traces
|
|
|
|
print t
|
|
|
|
# Once reported, delete traces
|
|
|
|
self.deleteANRs()
|
|
|
|
except DMError:
|
|
|
|
print "Error pulling %s" % traces
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
print "%s not found" % traces
|
|
|
|
|
2011-10-06 07:51:03 -07:00
|
|
|
def checkForCrashes(self, directory, symbolsPath):
|
2013-05-16 13:32:52 -07:00
|
|
|
self.checkForANRs()
|
|
|
|
|
2013-02-13 10:42:15 -08:00
|
|
|
logcat = self._devicemanager.getLogcat(filterOutRegexps=fennecLogcatFilters)
|
|
|
|
javaException = self.checkForJavaException(logcat)
|
|
|
|
if javaException:
|
|
|
|
return True
|
2013-04-19 15:31:16 -07:00
|
|
|
|
|
|
|
# If crash reporting is disabled (MOZ_CRASHREPORTER!=1), we can't say
|
|
|
|
# anything.
|
|
|
|
if not self.CRASHREPORTER:
|
|
|
|
return False
|
|
|
|
|
2012-11-20 07:24:28 -08:00
|
|
|
try:
|
2013-02-26 06:19:58 -08:00
|
|
|
dumpDir = tempfile.mkdtemp()
|
2013-02-08 08:32:07 -08:00
|
|
|
remoteCrashDir = self._remoteProfile + '/minidumps/'
|
|
|
|
if not self._devicemanager.dirExists(remoteCrashDir):
|
2013-04-19 15:31:16 -07:00
|
|
|
# If crash reporting is enabled (MOZ_CRASHREPORTER=1), the
|
|
|
|
# minidumps directory is automatically created when Fennec
|
|
|
|
# (first) starts, so its lack of presence is a hint that
|
|
|
|
# something went wrong.
|
2013-02-08 08:32:07 -08:00
|
|
|
print "Automation Error: No crash directory (%s) found on remote device" % remoteCrashDir
|
|
|
|
# Whilst no crash was found, the run should still display as a failure
|
|
|
|
return True
|
|
|
|
self._devicemanager.getDirectory(remoteCrashDir, dumpDir)
|
2013-03-21 06:19:34 -07:00
|
|
|
crashed = Automation.checkForCrashes(self, dumpDir, symbolsPath)
|
|
|
|
|
2013-02-08 08:32:07 -08:00
|
|
|
finally:
|
|
|
|
try:
|
|
|
|
shutil.rmtree(dumpDir)
|
|
|
|
except:
|
|
|
|
print "WARNING: unable to remove directory: %s" % dumpDir
|
2012-11-20 07:24:28 -08:00
|
|
|
return crashed
|
2011-10-06 07:51:03 -07:00
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
def buildCommandLine(self, app, debuggerInfo, profileDir, testURL, extraArgs):
|
|
|
|
# If remote profile is specified, use that instead
|
|
|
|
if (self._remoteProfile):
|
|
|
|
profileDir = self._remoteProfile
|
|
|
|
|
2012-08-14 07:41:11 -07:00
|
|
|
# Hack for robocop, if app & testURL == None and extraArgs contains the rest of the stuff, lets
|
2012-01-07 15:41:08 -08:00
|
|
|
# assume extraArgs is all we need
|
|
|
|
if app == "am" and extraArgs[0] == "instrument":
|
|
|
|
return app, extraArgs
|
2012-08-14 07:41:11 -07:00
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
cmd, args = Automation.buildCommandLine(self, app, debuggerInfo, profileDir, testURL, extraArgs)
|
|
|
|
# Remove -foreground if it exists, if it doesn't this just returns
|
|
|
|
try:
|
|
|
|
args.remove('-foreground')
|
|
|
|
except:
|
|
|
|
pass
|
|
|
|
#TODO: figure out which platform require NO_EM_RESTART
|
|
|
|
# return app, ['--environ:NO_EM_RESTART=1'] + args
|
|
|
|
return app, args
|
|
|
|
|
2010-07-26 18:43:34 -07:00
|
|
|
def getLanIp(self):
|
2010-11-18 13:03:44 -08:00
|
|
|
nettools = NetworkTools()
|
|
|
|
return nettools.getLanIp()
|
2010-07-26 18:43:34 -07:00
|
|
|
|
2012-02-28 09:20:56 -08:00
|
|
|
def Process(self, cmd, stdout = None, stderr = None, env = None, cwd = None):
|
2011-02-26 10:19:55 -08:00
|
|
|
if stdout == None or stdout == -1 or stdout == subprocess.PIPE:
|
2010-09-17 17:18:06 -07:00
|
|
|
stdout = self._remoteLog
|
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
return self.RProcess(self._devicemanager, cmd, stdout, stderr, env, cwd)
|
|
|
|
|
2012-08-14 07:41:11 -07:00
|
|
|
# be careful here as this inner class doesn't have access to outer class members
|
2010-06-24 02:32:01 -07:00
|
|
|
class RProcess(object):
|
|
|
|
# device manager process
|
|
|
|
dm = None
|
2012-02-28 09:20:56 -08:00
|
|
|
def __init__(self, dm, cmd, stdout = None, stderr = None, env = None, cwd = None):
|
2010-06-24 02:32:01 -07:00
|
|
|
self.dm = dm
|
2011-02-26 10:19:55 -08:00
|
|
|
self.stdoutlen = 0
|
2012-11-02 11:57:50 -07:00
|
|
|
self.lastTestSeen = "remoteautomation.py"
|
2011-02-24 11:45:42 -08:00
|
|
|
self.proc = dm.launchProcess(cmd, stdout, cwd, env, True)
|
|
|
|
if (self.proc is None):
|
2012-01-14 05:24:17 -08:00
|
|
|
if cmd[0] == 'am':
|
|
|
|
self.proc = stdout
|
|
|
|
else:
|
|
|
|
raise Exception("unable to launch process")
|
2010-06-24 02:32:01 -07:00
|
|
|
exepath = cmd[0]
|
|
|
|
name = exepath.split('/')[-1]
|
|
|
|
self.procName = name
|
2012-07-17 07:58:47 -07:00
|
|
|
# Hack for Robocop: Derive the actual process name from the command line.
|
|
|
|
# We expect something like:
|
|
|
|
# ['am', 'instrument', '-w', '-e', 'class', 'org.mozilla.fennec.tests.testBookmark', 'org.mozilla.roboexample.test/android.test.InstrumentationTestRunner']
|
|
|
|
# and want to derive 'org.mozilla.fennec'.
|
|
|
|
if cmd[0] == 'am' and cmd[1] == "instrument":
|
|
|
|
try:
|
|
|
|
i = cmd.index("class")
|
|
|
|
except ValueError:
|
|
|
|
# no "class" argument -- maybe this isn't robocop?
|
|
|
|
i = -1
|
|
|
|
if (i > 0):
|
|
|
|
classname = cmd[i+1]
|
|
|
|
parts = classname.split('.')
|
|
|
|
try:
|
|
|
|
i = parts.index("tests")
|
|
|
|
except ValueError:
|
|
|
|
# no "tests" component -- maybe this isn't robocop?
|
|
|
|
i = -1
|
|
|
|
if (i > 0):
|
|
|
|
self.procName = '.'.join(parts[0:i])
|
|
|
|
print "Robocop derived process name: "+self.procName
|
2010-06-24 02:32:01 -07:00
|
|
|
|
|
|
|
# Setting timeout at 1 hour since on a remote device this takes much longer
|
|
|
|
self.timeout = 3600
|
2012-08-08 07:25:27 -07:00
|
|
|
# The benefit of the following sleep is unclear; it was formerly 15 seconds
|
|
|
|
time.sleep(1)
|
2010-06-24 02:32:01 -07:00
|
|
|
|
|
|
|
@property
|
|
|
|
def pid(self):
|
Bug 795496 - Make mozdevice raise exceptions on error;r=ahal,jmaher
It turns out that relying on the user to check return codes for every
command was non-intuitive and resulted in many hard to trace bugs.
Now most functinos just return "None", and raise a DMError when there's an
exception. The exception to this are functions like dirExists, which now return
booleans, and throw exceptions on error. This is a fairly major refactor,
and also involved the following internal changes:
* Removed FileError and AgentError exceptions, replaced with DMError
(having to manage three different types of exceptions was confusing,
all the more so when we're raising them)
* Docstrings updated to remove references to return values where no
longer relevant
* pushFile no longer will create a directory to accomodate the file
if it doesn't exist (this makes it consistent with devicemanagerADB)
* dmSUT we validate the file, but assume that we get something back
from the agent, instead of falling back to manual validation in the
case that we didn't
* isDir and dirExists had the same intention, but different
implementations for dmSUT. Replaced the dmSUT impl of getDirectory
with that of isDir's (which was much simpler). Removed
isDir from devicemanager.py, since it wasn't used externally
* killProcess modified to check for process existence before running
(since the actual internal kill command will throw an exception
if the process doesn't exist)
In addition to all this, more unit tests have been added to test these
changes for devicemanagerSUT.
2012-10-04 08:28:07 -07:00
|
|
|
pid = self.dm.processExist(self.procName)
|
|
|
|
# HACK: we should probably be more sophisticated about monitoring
|
|
|
|
# running processes for the remote case, but for now we'll assume
|
|
|
|
# that this method can be called when nothing exists and it is not
|
|
|
|
# an error
|
|
|
|
if pid is None:
|
|
|
|
return 0
|
|
|
|
return pid
|
2012-08-14 07:41:11 -07:00
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
@property
|
|
|
|
def stdout(self):
|
2012-11-02 11:57:50 -07:00
|
|
|
""" Fetch the full remote log file using devicemanager and return just
|
|
|
|
the new log entries since the last call (as a multi-line string).
|
|
|
|
"""
|
Bug 795496 - Make mozdevice raise exceptions on error;r=ahal,jmaher
It turns out that relying on the user to check return codes for every
command was non-intuitive and resulted in many hard to trace bugs.
Now most functinos just return "None", and raise a DMError when there's an
exception. The exception to this are functions like dirExists, which now return
booleans, and throw exceptions on error. This is a fairly major refactor,
and also involved the following internal changes:
* Removed FileError and AgentError exceptions, replaced with DMError
(having to manage three different types of exceptions was confusing,
all the more so when we're raising them)
* Docstrings updated to remove references to return values where no
longer relevant
* pushFile no longer will create a directory to accomodate the file
if it doesn't exist (this makes it consistent with devicemanagerADB)
* dmSUT we validate the file, but assume that we get something back
from the agent, instead of falling back to manual validation in the
case that we didn't
* isDir and dirExists had the same intention, but different
implementations for dmSUT. Replaced the dmSUT impl of getDirectory
with that of isDir's (which was much simpler). Removed
isDir from devicemanager.py, since it wasn't used externally
* killProcess modified to check for process existence before running
(since the actual internal kill command will throw an exception
if the process doesn't exist)
In addition to all this, more unit tests have been added to test these
changes for devicemanagerSUT.
2012-10-04 08:28:07 -07:00
|
|
|
if self.dm.fileExists(self.proc):
|
|
|
|
try:
|
2013-06-28 04:49:53 -07:00
|
|
|
newLogContent = self.dm.pullFile(self.proc, self.stdoutlen)
|
Bug 795496 - Make mozdevice raise exceptions on error;r=ahal,jmaher
It turns out that relying on the user to check return codes for every
command was non-intuitive and resulted in many hard to trace bugs.
Now most functinos just return "None", and raise a DMError when there's an
exception. The exception to this are functions like dirExists, which now return
booleans, and throw exceptions on error. This is a fairly major refactor,
and also involved the following internal changes:
* Removed FileError and AgentError exceptions, replaced with DMError
(having to manage three different types of exceptions was confusing,
all the more so when we're raising them)
* Docstrings updated to remove references to return values where no
longer relevant
* pushFile no longer will create a directory to accomodate the file
if it doesn't exist (this makes it consistent with devicemanagerADB)
* dmSUT we validate the file, but assume that we get something back
from the agent, instead of falling back to manual validation in the
case that we didn't
* isDir and dirExists had the same intention, but different
implementations for dmSUT. Replaced the dmSUT impl of getDirectory
with that of isDir's (which was much simpler). Removed
isDir from devicemanager.py, since it wasn't used externally
* killProcess modified to check for process existence before running
(since the actual internal kill command will throw an exception
if the process doesn't exist)
In addition to all this, more unit tests have been added to test these
changes for devicemanagerSUT.
2012-10-04 08:28:07 -07:00
|
|
|
except DMError:
|
|
|
|
# we currently don't retry properly in the pullFile
|
|
|
|
# function in dmSUT, so an error here is not necessarily
|
|
|
|
# the end of the world
|
|
|
|
return ''
|
2013-06-28 04:49:53 -07:00
|
|
|
self.stdoutlen += len(newLogContent)
|
2012-11-02 11:57:50 -07:00
|
|
|
# Match the test filepath from the last TEST-START line found in the new
|
|
|
|
# log content. These lines are in the form:
|
|
|
|
# 1234 INFO TEST-START | /filepath/we/wish/to/capture.html\n
|
|
|
|
testStartFilenames = re.findall(r"TEST-START \| ([^\s]*)", newLogContent)
|
|
|
|
if testStartFilenames:
|
|
|
|
self.lastTestSeen = testStartFilenames[-1]
|
|
|
|
return newLogContent.strip('\n').strip()
|
Bug 795496 - Make mozdevice raise exceptions on error;r=ahal,jmaher
It turns out that relying on the user to check return codes for every
command was non-intuitive and resulted in many hard to trace bugs.
Now most functinos just return "None", and raise a DMError when there's an
exception. The exception to this are functions like dirExists, which now return
booleans, and throw exceptions on error. This is a fairly major refactor,
and also involved the following internal changes:
* Removed FileError and AgentError exceptions, replaced with DMError
(having to manage three different types of exceptions was confusing,
all the more so when we're raising them)
* Docstrings updated to remove references to return values where no
longer relevant
* pushFile no longer will create a directory to accomodate the file
if it doesn't exist (this makes it consistent with devicemanagerADB)
* dmSUT we validate the file, but assume that we get something back
from the agent, instead of falling back to manual validation in the
case that we didn't
* isDir and dirExists had the same intention, but different
implementations for dmSUT. Replaced the dmSUT impl of getDirectory
with that of isDir's (which was much simpler). Removed
isDir from devicemanager.py, since it wasn't used externally
* killProcess modified to check for process existence before running
(since the actual internal kill command will throw an exception
if the process doesn't exist)
In addition to all this, more unit tests have been added to test these
changes for devicemanagerSUT.
2012-10-04 08:28:07 -07:00
|
|
|
else:
|
|
|
|
return ''
|
2012-08-14 07:41:11 -07:00
|
|
|
|
2012-11-02 11:57:50 -07:00
|
|
|
@property
|
|
|
|
def getLastTestSeen(self):
|
|
|
|
return self.lastTestSeen
|
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
def wait(self, timeout = None):
|
|
|
|
timer = 0
|
2013-06-28 04:49:53 -07:00
|
|
|
interval = 20
|
2010-06-24 02:32:01 -07:00
|
|
|
|
|
|
|
if timeout == None:
|
|
|
|
timeout = self.timeout
|
|
|
|
|
2013-05-03 10:37:59 -07:00
|
|
|
while (self.dm.getTopActivity() == self.procName):
|
2013-06-28 04:49:53 -07:00
|
|
|
# retrieve log updates every 60 seconds
|
|
|
|
if timer % 60 == 0:
|
|
|
|
t = self.stdout
|
|
|
|
if t != '':
|
|
|
|
print t
|
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
time.sleep(interval)
|
|
|
|
timer += interval
|
|
|
|
if (timer > timeout):
|
|
|
|
break
|
|
|
|
|
2012-11-02 11:57:50 -07:00
|
|
|
# Flush anything added to stdout during the sleep
|
|
|
|
print self.stdout
|
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
if (timer >= timeout):
|
|
|
|
return 1
|
|
|
|
return 0
|
2012-08-14 07:41:11 -07:00
|
|
|
|
2010-06-24 02:32:01 -07:00
|
|
|
def kill(self):
|
|
|
|
self.dm.killProcess(self.procName)
|