Bug 1529079 - Fix Raptor fennec shutdown failure; r=bc
authorRob Wood <rwood@mozilla.com>
Fri, 22 Feb 2019 21:40:05 +0000
changeset 518546 9ec1ba39a978422f223fd7dd1723274b150de182
parent 518545 e9e880f7aee43ed8ebdcae192c28482235d2a8d6
child 518547 797abfd47a056c5a76077377b94e074e7c6a9b2a
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbc
bugs1529079
milestone67.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 1529079 - Fix Raptor fennec shutdown failure; r=bc Differential Revision: https://phabricator.services.mozilla.com/D20829
testing/raptor/raptor/raptor.py
--- a/testing/raptor/raptor/raptor.py
+++ b/testing/raptor/raptor/raptor.py
@@ -538,63 +538,48 @@ class RaptorAndroid(Raptor):
         proxy_prefs["network.proxy.http_port"] = 8080
         proxy_prefs["network.proxy.ssl"] = self.config['host']
         proxy_prefs["network.proxy.ssl_port"] = 8080
         proxy_prefs["network.proxy.no_proxies_on"] = self.config['host']
         self.profile.set_preferences(proxy_prefs)
 
     def launch_firefox_android_app(self):
         self.log.info("starting %s" % self.config['app'])
-        if self.config['app'] == "fennec":
-            self.launch_firefox_fennec()
-            return
 
         extra_args = ["-profile", self.device_profile,
                       "--es", "env0", "LOG_VERBOSE=1",
                       "--es", "env1", "R_LOG_LEVEL=6"]
 
         try:
             # make sure the android app is not already running
             self.device.stop_application(self.config['binary'])
 
-            self.device.launch_activity(self.config['binary'],
-                                        self.config['activity'],
-                                        extra_args=extra_args,
-                                        url='about:blank',
-                                        e10s=True,
-                                        fail_if_running=False)
-        except Exception:
+            if self.config['app'] == "fennec":
+                self.device.launch_fennec(self.config['binary'],
+                                          extra_args=extra_args,
+                                          url='about:blank',
+                                          fail_if_running=False)
+            else:
+                self.device.launch_activity(self.config['binary'],
+                                            self.config['activity'],
+                                            extra_args=extra_args,
+                                            url='about:blank',
+                                            e10s=True,
+                                            fail_if_running=False)
+        except Exception as e:
             self.log.error("Exception launching %s" % self.config['binary'])
+            self.log.error("Exception: %s %s" % (type(e).__name__, str(e)))
             if self.config['power_test']:
                 finish_geckoview_power_test(self)
             raise
 
         # give our control server the device and app info
         self.control_server.device = self.device
         self.control_server.app_name = self.config['binary']
 
-    def launch_firefox_fennec(self):
-        self.log.info("starting %s" % self.config['app'])
-        extra_args = ["-profile", self.device_profile,
-                      "--es", "env0", "LOG_VERBOSE=1",
-                      "--es", "env1", "R_LOG_LEVEL=6"]
-
-        try:
-            # if fennec is already running, shut it down first
-            self.device.stop_application(self.config['binary'])
-            self.device.launch_fennec(self.config['binary'],
-                                      extra_args=extra_args,
-                                      url='about:blank',
-                                      fail_if_running=False)
-        except Exception:
-            self.log.error("Exception launching %s" % self.config['binary'])
-            if self.config['power_test']:
-                finish_geckoview_power_test(self)
-            raise
-
     def run_test(self, test, timeout=None):
         if self.config['power_test']:
             init_geckoview_power_test(self)
 
         self.run_test_setup(test)
         self.create_raptor_sdcard_folder()
 
         if test.get('playback', None) is not None: