Bug 777500 - Log information about device before and after test for remote mochitest and reftests;r=jmaher
authorWilliam Lachance <wlachance@mozilla.com>
Wed, 25 Jul 2012 20:45:36 -0400
changeset 100490 3926441652e8
parent 100489 6e7fa061e61a
child 100491 acee68233906
push id12527
push userwlachance@mozilla.com
push date2012-07-26 00:45 +0000
treeherdermozilla-inbound@3926441652e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs777500
milestone17.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 777500 - Log information about device before and after test for remote mochitest and reftests;r=jmaher
layout/tools/reftest/remotereftest.py
testing/mochitest/runtestsremote.py
--- a/layout/tools/reftest/remotereftest.py
+++ b/layout/tools/reftest/remotereftest.py
@@ -419,16 +419,18 @@ def main(args):
     retVal = reftest.startWebServer(options)
     if retVal:
         return retVal
 
     procName = options.app.split('/')[-1]
     if (dm.processExist(procName)):
         dm.killProcess(procName)
 
+    print dm.getInfo()
+
 #an example manifest name to use on the cli
 #    manifest = "http://" + options.remoteWebServer + "/reftests/layout/reftests/reftest-sanity/reftest.list"
     logcat = []
     try:
         cmdlineArgs = ["-reftest", manifest]
         if options.bootstrap:
             cmdlineArgs = []
         dm.recordLogcat()
@@ -436,13 +438,14 @@ def main(args):
         logcat = dm.getLogcat()
     except:
         print "TEST-UNEXPECTED-FAIL | | exception while running reftests"
         reftest.stopWebServer(options)
         return 1
 
     reftest.stopWebServer(options)
     print ''.join(logcat[-500:-1])
+    print dm.getInfo()
     return 0
 
 if __name__ == "__main__":
     sys.exit(main(sys.argv[1:]))
 
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -402,16 +402,18 @@ def main():
     if (options == None):
         sys.exit(1)
     
     logParent = os.path.dirname(options.remoteLogFile)
     dm.mkDir(logParent);
     auto.setRemoteLog(options.remoteLogFile)
     auto.setServerInfo(options.webServer, options.httpPort, options.sslPort)
 
+    print dm.getInfo()
+
     procName = options.app.split('/')[-1]
     if (dm.processExist(procName)):
         dm.killProcess(procName)
     
     if options.robocop != "":
         mp = manifestparser.TestManifest(strict=False)
         # TODO: pull this in dynamically
         mp.read(options.robocop)
@@ -480,13 +482,14 @@ def main():
         mochitest.stopWebSocketServer(options)
         try:
             self.cleanup(None, options)
         except:
             pass
         sys.exit(1)
 
     print ''.join(logcat[-500:-1])
+    print dm.getInfo()
     sys.exit(retVal)
         
 if __name__ == "__main__":
     main()