Bug 1196287 - remove the useless print_logcat function. r=jmaher
authorJulien Pagès <j.parkouss@gmail.com>
Wed, 19 Aug 2015 21:39:55 +0200
changeset 1000 3625fcaa75ea
parent 999 335a890ad040
child 1001 762f27d9a07b
push id689
push userj.parkouss@gmail.com
push dateThu, 20 Aug 2015 04:53:05 +0000
reviewersjmaher
bugs1196287
Bug 1196287 - remove the useless print_logcat function. r=jmaher Also remove an old apk_path usage (was useful for android only)
talos/run_tests.py
--- a/talos/run_tests.py
+++ b/talos/run_tests.py
@@ -61,25 +61,16 @@ def buildCommandLine(test):
             url.extend(['-%s' % key, str(value)])
 
     # XXX we should actually return the list but since we abuse
     # the url as a command line flag to pass to firefox all over the place
     # will just make a string for now
     return ' '.join(url)
 
 
-def print_logcat():
-    if os.path.exists('logcat.log'):
-        with open('logcat.log') as f:
-            data = f.read()
-        for l in data.split('\r'):
-            # Buildbot will mark the job as failed if it finds 'ERROR'.
-            print l.replace('RROR', 'RR_R')
-
-
 def setup_webserver(webserver):
     """use mozhttpd to setup a webserver"""
     logging.info("starting webserver on %r" % webserver)
 
     host, port = webserver.split(':')
     return mozhttpd.MozHttpd(host=host, port=int(port), docroot=here)
 
 
@@ -136,19 +127,17 @@ def run_tests(config, browser_config):
                                     for i in browser_config['extensions']]
     browser_config['bcontroller_config'] = \
         utils.interpolate(browser_config['bcontroller_config'])
 
     # normalize browser path to work across platforms
     browser_config['browser_path'] = \
         os.path.normpath(browser_config['browser_path'])
 
-    binary = browser_config.get("apk_path")
-    if not binary:
-        binary = browser_config["browser_path"]
+    binary = browser_config["browser_path"]
     version_info = mozversion.get_version(binary=binary)
     browser_config['browser_name'] = version_info['application_name']
     browser_config['browser_version'] = version_info['application_version']
     browser_config['buildid'] = version_info['application_buildid']
     try:
         browser_config['repository'] = version_info['application_repository']
         browser_config['sourcestamp'] = version_info['application_changeset']
     except KeyError:
@@ -197,18 +186,16 @@ def run_tests(config, browser_config):
     try:
         # run the tests
         timer = utils.Timer()
         utils.stamped_msg(title, "Started")
         for test in tests:
             testname = test['name']
             utils.stamped_msg("Running test " + testname, "Started")
 
-            mozfile.remove('logcat.log')
-
             mytest = TTest()
             if mytest:
                 talos_results.add(mytest.runTest(browser_config, test))
             else:
                 utils.stamped_msg("Error found while running %s"
                                   % testname, "Error")
 
             utils.stamped_msg("Completed test " + testname, "Stopped")
@@ -223,17 +210,16 @@ def run_tests(config, browser_config):
         # problem and cannot continue
         #       this will prevent future tests from running
         utils.stamped_msg("Failed %s" % testname, "Stopped")
         traceback.print_exception(*sys.exc_info())
         # indicate a failure to buildbot, turn the job red
         return 2
     finally:
         httpd.stop()
-        print_logcat()
 
     elapsed = timer.elapsed()
     print "cycle time: " + elapsed
     utils.stamped_msg(title, "Stopped")
 
     # output results
     if results_urls:
         talos_results.output(results_urls)