From 9d3fb06b546190b8e30dc8c30033c9279f92e2ce Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Tue, 30 Jan 2018 15:17:47 -0800
Subject: [PATCH] Bug 1425330 - Part 1 - set up talos configurations for tart
 and ts_paint with XUL flexbox emulation;r=rwood

MozReview-Commit-ID: 7hl8cafIaSz

--HG--
extra : rebase_source : 653f5c7fb0022e64384983d33d7ab0a809a1396c
---
 testing/talos/talos.json    |  3 +++
 testing/talos/talos/test.py | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/testing/talos/talos.json b/testing/talos/talos.json
index 72a14f4ec641..17ffea1a75f4 100644
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -22,6 +22,9 @@
             "talos_options": ["--disable-stylo"],
             "tests": ["dromaeo_css", "kraken"]
         },
+        "flex-e10s": {
+            "tests": ["tart_flex", "ts_paint_flex"]
+        },
         "other-e10s": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_many_windows", "sessionrestore_no_auto_restore", "tabpaint", "cpstartup"]
         },
diff --git a/testing/talos/talos/test.py b/testing/talos/talos/test.py
index accaf28e0195..fec5ab117300 100644
--- a/testing/talos/talos/test.py
+++ b/testing/talos/talos/test.py
@@ -161,6 +161,11 @@ class ts_paint_heavy(ts_paint):
     profile = 'simple'
 
 
+@register_test()
+class ts_paint_flex(ts_paint):
+    preferences = {'layout.css.emulate-moz-box-with-flex': True}
+
+
 @register_test()
 class sessionrestore(TsBase):
     """
@@ -398,6 +403,11 @@ class tart(PageloaderTest):
     unit = 'ms'
 
 
+@register_test()
+class tart_flex(tart):
+    preferences = {'layout.css.emulate-moz-box-with-flex': True}
+
+
 @register_test()
 class cart(PageloaderTest):
     """