bug 841265 - stop trying to confirm installs that don't prompt in apps tests; r=fabrice
authorMyk Melez <myk@mozilla.org>
Thu, 14 Feb 2013 17:00:29 -0800
changeset 131866 4167e90a7a99d4b5d1303fcba74ca85cee1e022c
parent 131865 81bae9ea39ce79247338a38f249f1a10f8dd7b92
child 131867 ce7ef6d06439975fd9f31cddd5bb549c430a4dd4
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
bugs841265
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 841265 - stop trying to confirm installs that don't prompt in apps tests; r=fabrice
dom/tests/mochitest/webapps/test_install_errors.xul
--- a/dom/tests/mochitest/webapps/test_install_errors.xul
+++ b/dom/tests/mochitest/webapps/test_install_errors.xul
@@ -47,27 +47,25 @@ function noArgs(next) {
        "install without arguments throws exception");
     next();
   }
 }
 
 function parseError(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/json_syntax_error.webapp";
 
-  confirmNextInstall();
   navigator.mozApps.install(url, null).onerror = function onInstallError() {
     is(this.error.name, "MANIFEST_PARSE_ERROR", "manifest with syntax error");
     next();
   };
 }
 
 function invalidManifest(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/missing_required_field.webapp";
 
-  confirmNextInstall();
   navigator.mozApps.install(url, null).onerror = function onInstallError() {
     is(this.error.name, "INVALID_MANIFEST", "manifest missing required field");
     next();
   };
 }
 
 function permissionDenied(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/no_delegated_install.webapp";
@@ -86,17 +84,16 @@ function permissionDenied(next) {
       next();
     };
   };
 }
 
 function invalidContent(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/bad_content_type.webapp";
 
-  confirmNextInstall();
   var request = navigator.mozApps.install(url, null);
 
   request.onerror = function onInstallError() {
     is(this.error.name, "INVALID_MANIFEST", "manifest with bad content type");
     next();
   };
 
   request.onsuccess = function onInstall() {
@@ -105,77 +102,70 @@ function invalidContent(next) {
       next();
     };
   };
 }
 
 function invalidLaunchPath(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/invalid_launch_path.webapp";
 
-  confirmNextInstall();
   navigator.mozApps.install(url, null).onerror = function onInstallError() {
     is(this.error.name, "INVALID_MANIFEST", "Invalid Manifest");
     next();
   };
 }
 
 function invalidLaunchPath2(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/invalid_launch_path2.webapp";
 
-  confirmNextInstall();
   navigator.mozApps.install(url, null).onerror = function onInstallError() {
     is(this.error.name, "INVALID_MANIFEST", "Invalid Manifest");
     next();
   };
 }
 
 function invalidEntryPoint(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/invalid_entry_point.webapp";
 
-  confirmNextInstall();
   navigator.mozApps.install(url, null).onerror = function onInstallError() {
     is(this.error.name, "INVALID_MANIFEST", "manifest missing required field");
     next();
   };
 }
 
 function invalidLocaleEntryPoint(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/invalid_locale_entry_point.webapp";
 
-  confirmNextInstall();
   navigator.mozApps.install(url, null).onerror = function onInstallError() {
     is(this.error.name, "INVALID_MANIFEST", "manifest missing required field");
     next();
   };
 }
 
 function invalidActivityHref(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/invalid_activity_href.webapp";
 
-  confirmNextInstall();
   navigator.mozApps.install(url, null).onerror = function onInstallError() {
     is(this.error.name, "INVALID_MANIFEST", "Manifest has non-relative URI for activity href");
     next();
   };
 }
 
 function invalidActivityHref2(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/invalid_activity_href2.webapp";
 
-  confirmNextInstall();
   navigator.mozApps.install(url, null).onerror = function onInstallError() {
     is(this.error.name, "INVALID_MANIFEST", "Manifest has data: URI for activity href");
     next();
   };
 }
 
 function invalidMessage(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/invalid_message.webapp";
 
-  confirmNextInstall();
   navigator.mozApps.install(url, null).onerror = function onInstallError() {
     is(this.error.name, "INVALID_MANIFEST", "Manifest has absolute message href");
     next();
   };
 }
 
 function installPackageNotImplemented(next) {
   ok(!("installPackage" in navigator.mozApps),
@@ -202,17 +192,16 @@ function fileURL(next) {
   }
 
   next();
 }
 
 function originNotAllowed(next) {
   var url = "http://test/chrome/dom/tests/mochitest/webapps/apps/installs_allowed_from_example.com.webapp";
 
-  confirmNextInstall();
   var request = navigator.mozApps.install(url, null);
 
   request.onerror = function onInstallError() {
     is(this.error.name, "INSTALL_FROM_DENIED", "origin is not in installs_allowed_from");
     next();
   };
 
   request.onsuccess = function onInstall() {