Bug 1336712 - Drop test annotations and checks for Windows XP, Vista OS X < 10.9 and Android Gingerbread (2.3): devtools. r?RyanVM draft
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 04 Feb 2017 13:44:16 +0100
changeset 478963 e52dc8fc6a35841de115043c5a6ed8837f64d0bc
parent 478962 436a7d91042a1745f13a274709a12212bd516d1f
child 478964 4e67943ea1fe3b2ed69cd830b11d2d6a78499108
push id44108
push userarchaeopteryx@coole-files.de
push dateSat, 04 Feb 2017 12:49:41 +0000
reviewersRyanVM
bugs1336712
milestone54.0a1
Bug 1336712 - Drop test annotations and checks for Windows XP, Vista OS X < 10.9 and Android Gingerbread (2.3): devtools. r?RyanVM MozReview-Commit-ID: 8uTxPnd72Y4
devtools/client/framework/test/browser.ini
devtools/client/responsivedesign/test/browser_responsiveui.js
devtools/shared/system.js
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -83,15 +83,14 @@ skip-if = e10s # Bug 1069044 - destroyIn
 [browser_toolbox_tools_per_toolbox_registration.js]
 [browser_toolbox_transport_events.js]
 [browser_toolbox_view_source_01.js]
 [browser_toolbox_view_source_02.js]
 [browser_toolbox_view_source_03.js]
 [browser_toolbox_view_source_04.js]
 [browser_toolbox_window_reload_target.js]
 [browser_toolbox_window_shortcuts.js]
-skip-if = os == "mac" && os_version == "10.8" || os == "win" && os_version == "5.1" # Bug 851129 - Re-enable browser_toolbox_window_shortcuts.js test after leaks are fixed
 [browser_toolbox_window_title_changes.js]
 [browser_toolbox_window_title_frame_select.js]
 [browser_toolbox_zoom.js]
 [browser_two_tabs.js]
 # We want this test to run for mochitest-dt as well, so we include it here:
 [../../../../browser/base/content/test/general/browser_parsable_css.js]
--- a/devtools/client/responsivedesign/test/browser_responsiveui.js
+++ b/devtools/client/responsivedesign/test/browser_responsiveui.js
@@ -58,20 +58,17 @@ add_task(function* () {
   is(currentSize.width, widthBeforeClose, "width should be restored");
   is(currentSize.height, heightBeforeClose, "height should be restored");
 
   container = gBrowser.getBrowserContainer();
   is(container.getAttribute("responsivemode"), "true", "In responsive mode.");
   is(document.getElementById("menu_responsiveUI").getAttribute("checked"),
      "true", "menu item should be checked");
 
-  let isWinXP = navigator.userAgent.indexOf("Windows NT 5.1") != -1;
-  if (!isWinXP) {
-    yield testScreenshot(rdm);
-  }
+  yield testScreenshot(rdm);
 
   yield closeRDM(rdm);
   is(document.getElementById("menu_responsiveUI").getAttribute("checked"),
      "false", "menu item should be unchecked");
 });
 
 function* testPresets(rdm, manager) {
   // Starting from length - 4 because last 3 items are not presets :
--- a/devtools/shared/system.js
+++ b/devtools/shared/system.js
@@ -278,22 +278,16 @@ function getScreenDimensions() {
   return 11;
 }
 
 /**
  * Function for fetching OS CPU and returning
  * an enum for Telemetry.
  */
 function getOSCPU() {
-  if (oscpu.includes("NT 5.1") || oscpu.includes("NT 5.2")) {
-    return 0;
-  }
-  if (oscpu.includes("NT 6.0")) {
-    return 1;
-  }
   if (oscpu.includes("NT 6.1")) {
     return 2;
   }
   if (oscpu.includes("NT 6.2")) {
     return 3;
   }
   if (oscpu.includes("NT 6.3")) {
     return 4;