From 255f3959151c6b04d813a78f48517e1fa5d8a04e Mon Sep 17 00:00:00 2001
From: Garvan Keeley <gkeeley@mozilla.com>
Date: Fri, 19 Sep 2014 16:55:00 +0200
Subject: [PATCH] Bug 1061186 - increase timeout from 500ms to 1sec to avoid
 rare failures. r=jdm

---
 dom/tests/mochitest/geolocation/test_mozsettings.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dom/tests/mochitest/geolocation/test_mozsettings.html b/dom/tests/mochitest/geolocation/test_mozsettings.html
index 4564aa6be142..679db2abb511 100644
--- a/dom/tests/mochitest/geolocation/test_mozsettings.html
+++ b/dom/tests/mochitest/geolocation/test_mozsettings.html
@@ -14,13 +14,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=777594">Mozilla Bug 777594</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 SimpleTest.waitForExplicitFinish();
 
+var timeToWaitMs = 1000;
+
 resume_geolocationProvider(function() {
   force_prompt(true, test1);
 });
@@ -46,7 +48,7 @@ function test2() {
       setTimeout(function() {
 	  navigator.geolocation.getCurrentPosition(successCallbackAfterMozsettingOff,
                                                    failureCallbackAfterMozsettingOff);
-        }, 500); // need to wait a bit for all of these async callbacks to finish
+        }, timeToWaitMs); // need to wait a bit for all of these async callbacks to finish
   });
 }
 
@@ -58,7 +60,7 @@ function successCallbackAfterMozsettingOff(position) {
       setTimeout(function() {
          navigator.geolocation.getCurrentPosition(successCallbackAfterMozsettingOn,
                                                   failureCallbackAfterMozsettingOn);
-        }, 500); // need to wait a bit for all of these async callbacks to finish
+        }, timeToWaitMs); // need to wait a bit for all of these async callbacks to finish
     });
 }
 
@@ -70,7 +72,7 @@ function failureCallbackAfterMozsettingOff(error) {
       setTimeout(function() {
          navigator.geolocation.getCurrentPosition(successCallbackAfterMozsettingOn,
                                                   failureCallbackAfterMozsettingOn);
-        }, 500); // need to wait a bit for all of these async callbacks to finish
+        }, timeToWaitMs); // need to wait a bit for all of these async callbacks to finish
     });
 }