Backed out changeset 6afb408165ad (bug 1264325) for talos failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 24 May 2016 12:56:37 +0200
changeset 337753 ae4b9e58a98ae1f610f399606d5f6d245cb7a069
parent 337752 300e7b661cc4e0cdda28435dc13909ff37d96449
child 337754 dc9495156e2baae9ced1f29177ae446cd364b2f6
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)
bugs1264325
milestone49.0a1
backs out6afb408165adbb6431a8ad7aa428861bef0177ea
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
Backed out changeset 6afb408165ad (bug 1264325) for talos failures
testing/talos/talos/utils.py
--- a/testing/talos/talos/utils.py
+++ b/testing/talos/talos/utils.py
@@ -28,20 +28,16 @@ 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_'
-        elif '6.3' in platform.version():  # Bug 1264325 - FIXME: reports win8 instead of 8.1
-            return 'w8_'
-        elif '10.0' in platform.version(): # Bug 1264325 - FIXME: reports win8 instead of 10
-            return 'w8_'
         else:
             raise TalosError('unsupported windows version')
     elif platform.system() == "Darwin":
         return 'mac_'
 
 
 PLATFORM_TYPE = _get_platform()