Backed out changeset 936703b9e4cd (bug 1253618) for timeout in Linux Ld tests. r=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 15 Mar 2016 18:50:27 +0100
changeset 288805 a15ce89d5a1e9211156bd42d9f5d85e6cea8f276
parent 288804 0ffaddc56d2489add4601f2ee9170d889f007cc8
child 288806 f207e545c20e4216d2df3fee2a146949e487f95a
child 288820 b62e261d5ff862bb140c0de51d028d7f9f4a5c4c
push id30089
push userkwierso@gmail.com
push dateWed, 16 Mar 2016 00:26:08 +0000
treeherdermozilla-central@7773387a9a2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1253618
milestone48.0a1
backs out936703b9e4cd5c8aafd66767af2953415ddf498a
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
Backed out changeset 936703b9e4cd (bug 1253618) for timeout in Linux Ld tests. r=backout on a CLOSED TREE
testing/marionette/harness/marionette/runner/base.py
--- a/testing/marionette/harness/marionette/runner/base.py
+++ b/testing/marionette/harness/marionette/runner/base.py
@@ -548,17 +548,16 @@ class BaseMarionetteTestRunner(object):
         self.tree = tree
         self.type = type
         self.device_serial = device_serial
         self.symbols_path = symbols_path
         self.timeout = timeout
         self.socket_timeout = socket_timeout
         self._device = None
         self._capabilities = None
-        self._appinfo = None
         self._appName = None
         self.shuffle = shuffle
         self.shuffle_seed = shuffle_seed
         self.sdcard = sdcard
         self.sources = sources
         self.server_root = server_root
         self.this_chunk = this_chunk
         self.total_chunks = total_chunks
@@ -645,33 +644,16 @@ class BaseMarionetteTestRunner(object):
             return self._capabilities
 
         self.marionette.start_session()
         self._capabilities = self.marionette.session_capabilities
         self.marionette.delete_session()
         return self._capabilities
 
     @property
-    def appinfo(self):
-        if self._appinfo:
-            return self._appinfo
-
-        self.marionette.start_session()
-        with self.marionette.using_context('chrome'):
-            self._appinfo = self.marionette.execute_script("""
-            try {
-              return Services.appinfo;
-            } catch (e) {
-              return null;
-            }""")
-        self.marionette.delete_session()
-        self._appinfo = self._appinfo or {}
-        return self._appinfo
-
-    @property
     def device(self):
         if self._device:
             return self._device
 
         self._device = self.capabilities.get('device')
         return self._device
 
     @property
@@ -995,23 +977,21 @@ setReq.onerror = function() {
 
         if file_ext == '.ini':
             manifest = TestManifest()
             manifest.read(filepath)
 
             filters = []
             if self.test_tags:
                 filters.append(tags(self.test_tags))
-            e10s = self.appinfo.get('browserTabsRemoteAutostart', False)
             manifest_tests = manifest.active_tests(exists=False,
                                                    disabled=True,
                                                    filters=filters,
                                                    device=self.device,
                                                    app=self.appName,
-                                                   e10s=e10s,
                                                    **mozinfo.info)
             if len(manifest_tests) == 0:
                 self.logger.error("no tests to run using specified "
                                   "combination of filters: {}".format(
                                        manifest.fmt_filters()))
 
             unfiltered_tests = []
             for test in manifest_tests: