From fb8d768e7c4814ef2826b83e973393956517cd95 Mon Sep 17 00:00:00 2001
From: William Lachance <wlachance@mozilla.com>
Date: Fri, 30 Jun 2017 09:55:59 -0700
Subject: [PATCH] Bug 1377398 - Explicitly unsupport WinXP and remove hacks
 r=jmaher

MozReview-Commit-ID: DkCHu73iX15

--HG--
extra : rebase_source : 83ab617065a8953322a24734ea73b72c813a1cd2
---
 testing/talos/talos/config.py | 3 ---
 testing/talos/talos/test.py   | 7 ++-----
 testing/talos/talos/ttest.py  | 5 -----
 testing/talos/talos/utils.py  | 4 +---
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/testing/talos/talos/config.py b/testing/talos/talos/config.py
index 5ea095352463..5f5becf6e1ea 100644
--- a/testing/talos/talos/config.py
+++ b/testing/talos/talos/config.py
@@ -310,9 +310,6 @@ def get_active_tests(config):
         raise ConfigurationError("No definition found for test(s): %s"
                                  % missing)
 
-    # disabled DAMP on winXP: frequent hangs, <3% of devtools users on winXP
-    if utils.PLATFORM_TYPE == 'win_':
-        activeTests = [i for i in activeTests if i != 'damp']
     return activeTests
 
 
diff --git a/testing/talos/talos/test.py b/testing/talos/talos/test.py
index b3110c26bfde..660fe78e7140 100644
--- a/testing/talos/talos/test.py
+++ b/testing/talos/talos/test.py
@@ -1,5 +1,5 @@
 import os
-from talos import filter, utils
+from talos import filter
 
 """
 test definitions for Talos
@@ -299,10 +299,7 @@ class tps(PageloaderTest):
                                                      'tests',
                                                      'tp5o.html'),
         'addon.test.tabswitch.webserver': '${webserver}',
-        # limit the page set number for winxp as we have issues.
-        # see https://bugzilla.mozilla.org/show_bug.cgi?id=1195288
-        'addon.test.tabswitch.maxurls':
-            45 if utils.PLATFORM_TYPE == 'win_' else -1,
+        'addon.test.tabswitch.maxurls': -1,
     }
     unit = 'ms'
 
diff --git a/testing/talos/talos/ttest.py b/testing/talos/talos/ttest.py
index 0e03d2d666d4..540bca937c47 100644
--- a/testing/talos/talos/ttest.py
+++ b/testing/talos/talos/ttest.py
@@ -61,11 +61,6 @@ class TTest(object):
 
         LOG.debug("operating with platform_type : %s" % self.platform_type)
 
-        # Bug 1262954: winxp + e10s, disable hwaccel
-        if self.platform_type == "win_" and browser_config['e10s']:
-            prefs = browser_config['preferences']
-            prefs['layers.acceleration.disabled'] = True
-
         with FFSetup(browser_config, test_config) as setup:
             return self._runTest(browser_config, test_config, setup)
 
diff --git a/testing/talos/talos/utils.py b/testing/talos/talos/utils.py
index 2b332d2301ee..f73639a08653 100755
--- a/testing/talos/talos/utils.py
+++ b/testing/talos/talos/utils.py
@@ -27,9 +27,7 @@ def _get_platform():
     if platform.system() == "Linux":
         return 'linux_'
     elif platform.system() in ("Windows", "Microsoft"):
-        if '5.1' in platform.version():  # winxp
-            return 'win_'
-        elif '6.1' in platform.version():  # w7
+        if '6.1' in platform.version():  # w7
             return 'w7_'
         elif '6.2' in platform.version():  # w8
             return 'w8_'