Merge backout mozilla1.9.1
authorHenrik Skupin <hskupin@mozilla.com>
Thu, 28 Oct 2010 18:31:15 +0200
branchmozilla1.9.1
changeset 803 26a82a30f5690ec5323a2c7d5524d66b05e544b4
parent 795 18134d50cc941fc817eee0092585305265e81d92 (current diff)
parent 802 3dde88cef2ba4276ab8923667183fb45c0e6b036 (diff)
child 806 635eee9055b58e59603214848a79bebb2fa37332
push id704
push userhskupin@mozilla.com
push dateThu, 28 Oct 2010 16:31:28 +0000
Merge backout
shared-modules/testSoftwareUpdateAPI.js
--- a/shared-modules/testSoftwareUpdateAPI.js
+++ b/shared-modules/testSoftwareUpdateAPI.js
@@ -42,17 +42,17 @@
  */
 
 const MODULE_NAME = 'SoftwareUpdateAPI';
 
 const RELATIVE_ROOT = '.';
 const MODULE_REQUIRES = ['PrefsAPI', 'UtilsAPI'];
 
 const gTimeout                = 5000;
-const gTimeoutUpdateCheck     = 30000;
+const gTimeoutUpdateCheck     = 10000;
 const gTimeoutUpdateDownload  = 360000;
 
 /**
  * Constructor for software update class
  */
 function softwareUpdate()
 {
   this._controller = null;