Bug 797112 - we have a call to dm.checkCmd and that api doesn't exist anymore. r=wlach
authorJoel Maher <jmaher@mozilla.com>
Wed, 03 Oct 2012 11:07:31 -0400
changeset 109072 2622aa008fe922164d65f72c814a82035c6c5dc3
parent 109071 f6d4ab10d670cd3f146a54d2f0f4d9b04ed4913f
child 109073 37150f9ca8b8a7bea1b269b00c81ca4c65597482
push id15830
push userjmaher@mozilla.com
push dateWed, 03 Oct 2012 15:08:06 +0000
treeherdermozilla-inbound@2622aa008fe9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswlach
bugs797112
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 797112 - we have a call to dm.checkCmd and that api doesn't exist anymore. r=wlach
testing/mochitest/runtestsremote.py
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -194,16 +194,17 @@ class MochiRemote(Mochitest):
     def __init__(self, automation, devmgr, options):
         self._automation = automation
         Mochitest.__init__(self, self._automation)
         self._dm = devmgr
         self.runSSLTunnel = False
         self.remoteProfile = options.remoteTestRoot + "/profile"
         self._automation.setRemoteProfile(self.remoteProfile)
         self.remoteLog = options.remoteLogFile
+        self.localLog = options.logFile
 
     def cleanup(self, manifest, options):
         self._dm.getFile(self.remoteLog, self.localLog)
         self._dm.removeFile(self.remoteLog)
         self._dm.removeDir(self.remoteProfile)
 
         if (options.pidFile != ""):
             try:
@@ -436,17 +437,17 @@ def main():
         os.unlink(fHandle.name)
         fennec_ids = os.path.abspath("fennec_ids.txt")
         if not os.path.exists(fennec_ids) and options.robocopIds:
             fennec_ids = options.robocopIds
         dm.pushFile(fennec_ids, os.path.join(deviceRoot, "fennec_ids.txt"))
         options.extraPrefs.append('robocop.logfile="%s/robocop.log"' % deviceRoot)
 
         if (options.dm_trans == 'adb' and options.robocopPath):
-          dm.checkCmd(["install", "-r", os.path.join(options.robocopPath, "robocop.apk")])
+          dm._checkCmd(["install", "-r", os.path.join(options.robocopPath, "robocop.apk")])
 
         appname = options.app
         retVal = None
         logcat = []
         for test in robocop_tests:
             if options.testPath and options.testPath != test['name']:
                 continue