From f48bb12849c81877d87f81e9e79873b2a3b8b020 Mon Sep 17 00:00:00 2001 From: Avi Halachmi Date: Tue, 24 May 2016 21:04:43 +0300 Subject: [PATCH] Bug 1264325 -talos: allow running on windows 8.1/10 with python 2.7.11. r=jmaher --HG-- extra : rebase_source : 76b19d3b0a13c6a3e8b10603c336d11a31595daf --- testing/talos/talos/utils.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testing/talos/talos/utils.py b/testing/talos/talos/utils.py index ac5cad79017d..2b332d2301ee 100755 --- a/testing/talos/talos/utils.py +++ b/testing/talos/talos/utils.py @@ -33,6 +33,12 @@ def _get_platform(): 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":