From 6cd0feee31efe35a4c6bcb82c578b5a174688c5d Mon Sep 17 00:00:00 2001 From: "JiaLi.Passion" Date: Sat, 7 Jan 2017 10:29:27 +0900 Subject: [PATCH 1/2] fix #584 remove sauce labs test target of Android 4.1,4.2,4.3 --- sauce.conf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sauce.conf.js b/sauce.conf.js index facaec940..f42def42d 100644 --- a/sauce.conf.js +++ b/sauce.conf.js @@ -76,7 +76,7 @@ module.exports = function (config) { platform: 'Windows 10', version: '13.10586' }, - 'SL_ANDROID4.1': { + /*'SL_ANDROID4.1': { base: 'SauceLabs', browserName: 'android', platform: 'Linux', @@ -99,7 +99,7 @@ module.exports = function (config) { browserName: 'android', platform: 'Linux', version: '4.4' - }, + },*/ 'SL_ANDROID5.1': { base: 'SauceLabs', browserName: 'android', From da3711a553e1655ffd9262048696a24af58702a4 Mon Sep 17 00:00:00 2001 From: "JiaLi.Passion" Date: Sat, 7 Jan 2017 16:58:17 +0900 Subject: [PATCH 2/2] add no ssl options to pass android 4.4 --- sauce.conf.js | 8 +++++--- scripts/sauce/sauce_connect_setup.sh | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sauce.conf.js b/sauce.conf.js index f42def42d..7915c47fc 100644 --- a/sauce.conf.js +++ b/sauce.conf.js @@ -76,7 +76,9 @@ module.exports = function (config) { platform: 'Windows 10', version: '13.10586' }, - /*'SL_ANDROID4.1': { + /* + fix issue #584, Android 4.1~4.3 are not supported + 'SL_ANDROID4.1': { base: 'SauceLabs', browserName: 'android', platform: 'Linux', @@ -93,13 +95,13 @@ module.exports = function (config) { browserName: 'android', platform: 'Linux', version: '4.3' - }, + },*/ 'SL_ANDROID4.4': { base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.4' - },*/ + }, 'SL_ANDROID5.1': { base: 'SauceLabs', browserName: 'android', diff --git a/scripts/sauce/sauce_connect_setup.sh b/scripts/sauce/sauce_connect_setup.sh index 77ab84543..5a88eaa53 100755 --- a/scripts/sauce/sauce_connect_setup.sh +++ b/scripts/sauce/sauce_connect_setup.sh @@ -46,4 +46,4 @@ echo " $CONNECT_LOG" echo " $CONNECT_STDOUT" echo " $CONNECT_STDERR" sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS \ - --reconnect 100 --logfile $CONNECT_LOG 2> $CONNECT_STDERR 1> $CONNECT_STDOUT & + --reconnect 100 --no-ssl-bump-domains all --logfile $CONNECT_LOG 2> $CONNECT_STDERR 1> $CONNECT_STDOUT &