Bug 835090 - Where possible app update xpcshell tests should run on xulrunner. r=bbondy

toolkit/mozapps/update/test/unit/head_update.js.in

@@ -303,6 +303,17 @@ const STATE_APPLIED_PLATFORM = STATE_APPLIED_SVC;
 const STATE_APPLIED_PLATFORM = STATE_APPLIED;
 #endif
 
+// This makes it possible to run most tests on xulrunner where the update
+// channel default preference is not set.
+if (APP_BIN_NAME == "xulrunner") {
+  try {
+    gDefaultPrefBranch.getCharPref(PREF_APP_UPDATE_CHANNEL);
+  }
+  catch (e) {
+    setUpdateChannel("test_channel");
+  }
+}
+
 /**
  * Nulls out the most commonly used global vars used by tests as appropriate.
  */
@@ -336,7 +347,7 @@ function cleanUp() {
     gXHR             = null;
   }
 
-  gTestserver    = null;
+  gTestserver = null;
 }
 
 /**

toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js

@@ -30,6 +30,11 @@ let gProcess;
 let gTimeoutRuns = 0;
 
 function run_test() {
+  if (APP_BIN_NAME == "xulrunner") {
+    logTestInfo("Unable to run this test on xulrunner");
+    return;
+  }
+
   do_test_pending();
   do_register_cleanup(end_test);
 

toolkit/mozapps/update/test/unit/test_0201_app_launch_apply_update.js

@@ -101,6 +101,11 @@ function symlinkUpdateFilesIntoBundleDirectory() {
 }
 
 function run_test() {
+  if (APP_BIN_NAME == "xulrunner") {
+    logTestInfo("Unable to run this test on xulrunner");
+    return;
+  }
+
   do_test_pending();
   do_register_cleanup(end_test);
 

toolkit/mozapps/update/test/unit/test_0202_app_launch_apply_update_dirlocked.js

@@ -97,6 +97,11 @@ function symlinkUpdateFilesIntoBundleDirectory() {
 }
 
 function run_test() {
+  if (APP_BIN_NAME == "xulrunner") {
+    logTestInfo("Unable to run this test on xulrunner");
+    return;
+  }
+
   do_test_pending();
   do_register_cleanup(end_test);
 

toolkit/mozapps/update/test/unit/test_0203_app_launch_apply_update.js

@@ -109,6 +109,11 @@ function symlinkUpdateFilesIntoBundleDirectory() {
 }
 
 function run_test() {
+  if (APP_BIN_NAME == "xulrunner") {
+    logTestInfo("Unable to run this test on xulrunner");
+    return;
+  }
+
   do_test_pending();
   do_register_cleanup(end_test);
 

toolkit/mozapps/update/test/unit/test_bug794211.js

@@ -11,7 +11,6 @@ const NETWORK_ERROR_OFFLINE = 111;
 function run_test() {
   do_test_pending();
   do_register_cleanup(end_test);
-  DEBUG_AUS_TEST = true;
 
   logTestInfo("test when an update check fails because the network is " +
               "offline that we check again when the network comes online. " +