Bug 1264325 -talos: allow running on windows 8.1/10 with python 2.7.11. r=jmaher
authorAvi Halachmi <avihpit@yahoo.com>
Tue, 24 May 2016 21:04:43 +0300
changeset 337849 e6fce92905c8c40ff06a0cb14d4d0af4453c1a94
parent 337848 2044b159f030e51be397063355d70323bac0df61
child 337850 aee22493e3c20cbe213113ec30d93a9ce0bcdd6f
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1264325
milestone49.0a1
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
Bug 1264325 -talos: allow running on windows 8.1/10 with python 2.7.11. r=jmaher
testing/talos/talos/utils.py
--- a/testing/talos/talos/utils.py
+++ b/testing/talos/talos/utils.py
@@ -28,16 +28,22 @@ def _get_platform():
         return 'linux_'
     elif platform.system() in ("Windows", "Microsoft"):
         if '5.1' in platform.version():  # winxp
             return 'win_'
         elif '6.1' in platform.version():  # w7
             return 'w7_'
         elif '6.2' in platform.version():  # w8
             return 'w8_'
+        # Bug 1264325 - FIXME: with python 2.7.11: reports win8 instead of 8.1
+        elif '6.3' in platform.version():
+            return 'w8_'
+        # Bug 1264325 - FIXME: with python 2.7.11: reports win8 instead of 10
+        elif '10.0' in platform.version():
+            return 'w8_'
         else:
             raise TalosError('unsupported windows version')
     elif platform.system() == "Darwin":
         return 'mac_'
 
 
 PLATFORM_TYPE = _get_platform()