Bug 1253618 - Add support for |skip-if = e10s| manifest annotations in Marionette runner; r=automatedtester

MozReview-Commit-ID: ApTPQNa2R1c

--HG--
extra : rebase_source : 599b8f976355cc21e5e5aa4707381f68d21b867e

testing/marionette/harness/marionette/runner/base.py

@@ -553,6 +553,7 @@ class BaseMarionetteTestRunner(object):
         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
@@ -648,6 +649,23 @@ class BaseMarionetteTestRunner(object):
         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:
@@ -982,11 +1000,13 @@ setReq.onerror = function() {
             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 "