From 823d4da6a2cbfac75acee35b6e15b6b5251d99ad Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Mon, 28 Oct 2013 16:58:09 -0700
Subject: [PATCH] fiddle with some timeouts to account for older/slower
 emulators and time testruns

---
 bin/test.sh                 | 8 ++++----
 test/helpers/driverblock.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/test.sh b/bin/test.sh
index f296a9635bd..eab4f6e0fa9 100755
--- a/bin/test.sh
+++ b/bin/test.sh
@@ -51,7 +51,7 @@ for arg in "$@"; do
     fi
 done
 
-appium_mocha="mocha -t 60000 -R spec $mocha_args"
+appium_mocha="mocha -t 90000 -R spec $mocha_args"
 
 mkdir -p ./test/functional/_joined
 
@@ -68,7 +68,7 @@ if $ios_only || $all_tests; then
     else
         echo "Did not find /Applications/Xcode-6.1.app, using default"
     fi
-    $appium_mocha $ios_testfile
+    time $appium_mocha $ios_testfile
 fi
 
 if $ios7_only || $all_tests; then
@@ -84,7 +84,7 @@ if $ios7_only || $all_tests; then
     else
         echo "Did not find /Applications/Xcode-7.0.app, using default"
     fi
-    $appium_mocha $ios7_testfile
+    time $appium_mocha $ios7_testfile
 fi
 
 if $did_switch_xcode; then
@@ -98,5 +98,5 @@ if $android_only || $all_tests; then
     android_testfile="./test/functional/_joined/android.js"
     android_dirs="apidemos selendroid android"
     join_testfiles android $android_testfile $android_dirs
-    $appium_mocha $android_testfile
+    time $appium_mocha $android_testfile
 fi
diff --git a/test/helpers/driverblock.js b/test/helpers/driverblock.js
index 7a5d28f8ebe..5fd4f457e0c 100644
--- a/test/helpers/driverblock.js
+++ b/test/helpers/driverblock.js
@@ -30,7 +30,7 @@ var driverBlock = function(tests, host, port, caps, extraCaps) {
   port = (typeof port === "undefined" || port === null) ? _.clone(defaultPort) : port;
   caps = (typeof caps === "undefined" || caps === null) ? _.clone(defaultCaps) : caps;
   caps = _.extend(caps, typeof extraCaps === "undefined" ? {} : extraCaps);
-  caps.launchTimeout = 18000;
+  caps.launchTimeout = 30000;
   var driverHolder = {driver: null, sessionId: null};
   var expectConnError = extraCaps && extraCaps.expectConnError;