← Back to branch summary

~mozillateam/firefox/firefox.disco

« back to all changes in this revision

Viewing changes to debian/patches/test-fixes/xpcshell-search-fix-browser-dirprovider.patch

  • Committer: Chris Coulson
  • Date: 2013-02-20 09:17:36 UTC
  • mto: This revision was merged to the branch mainline in revision 972.
  • Revision ID: chris.coulson@canonical.com-20130220091736-ofjaczrz2wc4nidl
https://launchpad.net/bugs/974146
* New upstream release from the beta channel
* Refresh patches
  - update debian/patches/mozilla-kde.patch
* Drop patches fixed upstream
  - remove debian/patches/ionmonkey-hardfp-support.patch
  - update debian/patches/series.in
* firefox-gnome-support needs explicit dependency on libnotify
  - update debian/control{,.in}
* Add support for autopkgtest, package the xpcshell, reftest and
  mochitest testsuites and migrate the xpcshell-tests, reftest, crashtest,
  jstestbrowser and mochitest targets to this. Note that tests that can't
  be ran as an autopkgtest (eg, if they require write permissions to the
  application directory) will still be ran at build time
  - add firefox-testsuite package in debian/control.in
  - update debian/control
  - add debian/firefox-testsuite.install.in
  - add debian/firefox-testsuite.links.in
  - update debian/build/mozbuild.mk
  - update debian/rules
  - drop xpcshell-tests, reftest, crashtest, jstestbrowser and mochitest
    targets from debian/build/testsuite.mk, add xpcshell-tests-build
    and the ability to run xpcshell-tests with our own reduced manifest
  - add debian/tests/control
  - add debian/tests/crashtest
  - add debian/tests/jstestbrowser
  - add debian/tests/mochitest
  - add debian/tests/reftest
  - add debian/tests/xpcshell-tests
  - add debian/testing/run_mochitest.in
  - add debian/testing/run_xpcshell_tests.in
  - add debian/testing/run_reftest.in
  - add debian/testing/testrunhelper.py
  - update debian/config/mozconfig.in to always build with --enable-tests
  - add debian/testing/xpcshell-build.ini
* Ensure that the directory provider returns all searchplugin paths during
  the search service xpcshell tests
  - add d/p/test-fixes/xpcshell-search-fix-browser-dirprovider.patch
  - update debian/patches/series.in
* Fix various tests that assume that either the application directory or
  test directory can be written to
  - add d/p/test-fixes/xpcshell-docshell-no-writes-to-appdir.patch
  - add d/p/test-fixes/xpcshell-contentprefs-no-writes-to-appdir.patch
  - add d/p/test-fixes/xpcshell-exthandler-no-writes-to-appdir.patch
  - add d/p/test-fixes/xpcshell-ctypes-no-writes-to-appdir.patch
  - add d/p/test-fixes/xpcshell-xpcom-no-writes-to-testdir-or-appdir.patch
  - add d/p/test-fixes/xpcshell-libpref-no-writes-to-testdir.patch
  - update debian/patches/series.in
* Export NO_PNG_PKG_MANGLE as optipng breaks tests that are dependent
  on image format / size
  - update debian/build/mozbuild.mk
* Don't test that the addon selection dialog appears in test_bug596343.js,
  as we disable this
  - add d/p/test-integration/xpcshell-disable-addon-select-dialog-test-for-adt.patch
  - update debian/patches/series
* Don't write a log file to the script directory from mochitest
  - add d/p/test-integration/mochitest-optional-websock-log.patch
  - update debian/patches/series.in
* Fix a failure in test_nodb_pluschanges.js due to const redeclaration
  - add d/p/test-fixes/xpcshell-search-fix-const-redeclaration.patch
  - update debian/patches/series.in
* Don't run the GConf-specific test_421977.js on systems where GSettings
  is available, as it will fail
  - add d/p/t-f/xpcshell-shell-disable-gconf-tests-when-using-gsettings.patch
  - update debian/patches/series.in
* Disable test_upgrade.js and test_upgrade_strictcompat.js xpcshell tests
  for now as they require write access to the application directory
  - add d/p/test-integration/xpcshell-disable-tests-which-need-appdir-write-access.patch
  - update debian/patches/series.in
* Disable test_browserGlue_distribution.js for now as it requires write
  access to the application directory
  - update d/p/test-integration/xpcshell-disable-tests-which-need-appdir-write-access.patch
* Reset the "browser" and "embed-app" content prefs after running content
  mochitests, so that the subsequent DOM browser-element tests don't
  fail
  - add d/p/test-fixes/mochitest-content-reset-permissions-when-done.patch
  - update debian/patches/series.in
* Disable various failing mochitests:
  - add debian/testing/mochitest.json
  - add debian/testing/mochitest-chrome.json
  - update debian/firefox-testsuite.install.in
* Fix issue where some tests were being added to the mochitest tests.jar
  using their absolute path in the build tree
  - add debian/patches/test-fixes/mochitest-tests-jar-fix.patch
  - update debian/patches/series.in
* Don't run the GConf specific browser_420786.js mochitest on systems where
  GSettings is available, as it will fail
  - add d/p/t-f/mochitest-shell-disable-gconf-tests-when-using-gsettings.patch
  - update debian/patches/series.in
* Don't ship the browser_bug538331.js mochitest as this isn't relevant
  when not using the Mozilla AUS
  - add d/p/test-fixes/mochitest-dont-ship-browser-postupdate-test.patch
  - update debian/patches/series.in
* Make "--test-manifest" work when running chrome, browser-chrome and a11y
  mochitests so that we can maintain a distro manifest for these
  - add d/p/test-integration/mochitest-allow-test-manifest-for-chrome.patch
  - update debian/patches/series.in
* Disable failing reftests
  - add d/p/test-overrides/reftest-disable-failing-tests.patch
  - update debian/patches/series.in
* Add vendor xpcshell tests to verify that the search service loads
  the expected number of search plugins from each language pack
  - update debian/build/mozbuild.mk
  - add debian/firefox-testsuite.dirs.in
  - update debian/firefox-testsuite.install.in
  - update debian/rules
  - add debian/testing/xpcshell-package-tests/head_package_tests.js
  - add debian/testing/xpcshell-package-tests/test_searchplugins_valid.js
  - add debian/testing/xpcshell-package-tests/test_searchplugins_valid_real.js
  - add debian/testing/xpcshell-package-tests/xpcshell.ini
  - update debian/tests/control
  - add debian/tests/xpcshell-package-tests
* Drop the hacky perl scripts that were being used to make sure the language
  packs ship the correct plugins. Add a xpcshell test instead
  - update debian/build/mozbuild.mk
  - update debian/rules
  - remove debian/build/refresh-search-modifications.pl
  - remove debian/build/verify-search-overrides.pl
  - remove debian/config/search-mods.list
  - update debian/control.in
  - remove debian/searchplugins/compute-overrides.json
  - add debian/testing/xpcshell-package-tests/test_ubuntu_searchplugins.js
  - add debian/testing/xpcshell-package-tests/test_ubuntu_searchplugins_real.js
  - update debian/testing/xpcshell-package-tests/xpcshell.ini
* Fix a test failure with the Italian Amazon search plugin 
  - update debian/searchplugins/it/amazon-it.xml
* We set intl.locale.matchOS to ensure that Firefox uses the environment
  locale. Add a test to make sure this works as expected
  - add debian/testing/xpcshell-package-tests/test_locale_matchOS.js
  - add debian/testing/xpcshell-package-tests/test_locale_matchOS_real.js
  - update debian/testing/xpcshell-package-tests/head_package_tests.js
  - update debian/testing/xpcshell-package-tests/test_searchplugins_valid.js
  - update debian/testing/xpcshell-package-tests/test_ubuntu_searchplugins.js
  - update debian/testing/xpcshell-package-tests/xpcshell.ini
  - update debian/tests/control
  - update debian/tests/crashtest
  - update debian/tests/jstestbrowser
  - update debian/tests/mochitest
  - update debian/tests/reftest
  - update debian/tests/xpcshell-package-tests
  - update debian/tests/xpcshell-tests
* We modify the user agent, so test that it is correct
  - add debian/testing/xpcshell-package-tests/test_ubuntu_useragent.js
  - update debian/testing/xpcshell-package-tests/xpcshell.ini
* LP: #974146 - Add a "Open a New Private Window" action to the desktop file
  - update debian/firefox.desktop.in
* Don't try to override the Amazon searchplugin for Kashubian or Mongolian,
  as it doesn't exist there
  - add debian/searchplugins/csb/list.txt
  - add debian/searchplugins/mn/list.txt
  - update d/t/xpcshell-package-tests/test_ubuntu_searchplugins_real.js
* Testpilot only enabled on beta now
  - update debian/firefox.install.in
* Don't run dh_scour on the testsuite package, as this screws up a lot
  of reftests and crashtests
  - update debian/build/mozbuild.mk
* Add a test to make sure all of the language packs are loadable by the
  addon manager
  - add debian/testing/xpcshell-package-tests/test_langpack_load.js
  - update debian/testing/xpcshell-package-tests/xpcshell.ini
* Add a test to make sure language pack chrome is registered correctly
  - add debian/testing/xpcshell-package-tests/test_langpack_chrome.js
  - update debian/testing/xpcshell-package-tests/xpcshell.ini
* Disable failing xpcshell tests
  - add d/p/test-overrides/xpcshell-disable-failing-tests.patch
  - update debian/patches/series.in
* Add JUnit output support for reftests
  - add d/p/test-integration/reftest-output-junit-xml.patch
  - update debian/patches/series.in
  - update debian/testing/run_reftest.in
* Allow xpcshell tests to be run with JUnit outputting, and include a fix
  to make sure that the output matches the schema
  - update debian/testing/run_xpcshell_tests.in
  - add d/p/test-integration/xpcshell-output-valid-junit-xml.patch
  - update debian/patches/series.in
* Add JUnit output support for mochitests
  - add d/p/test-integration/mochitest-output-junit-xml.patch
  - update debian/patches/series.in
  - update debian/testing/run_mochitest.in
* Turn on JUnit XML output for all tests
  - update debian/build/mozbuild.mk
  - update debian/tests/crashtest
  - update debian/tests/jstestbrowser
  - update debian/tests/mochitest
  - update debian/tests/reftest
  - update debian/tests/xpcshell-package-tests
  - update debian/tests/xpcshell-tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/test-fixes/xpcshell-search-fix-browser-dirprovider.patch
 
1
Index: firefox-trunk-19.0~a1~hg20121114r113129/toolkit/components/search/tests/xpcshell/head_search.js
 
2
===================================================================
 
3
--- firefox-trunk-19.0~a1~hg20121114r113129.orig/toolkit/components/search/tests/xpcshell/head_search.js        2012-11-14 00:37:53.000000000 +0000
 
4
+++ firefox-trunk-19.0~a1~hg20121114r113129/toolkit/components/search/tests/xpcshell/head_search.js     2012-11-14 14:08:13.854550000 +0000
 
5
@@ -1,9 +1,13 @@
 
6
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
7
 /* vim:set ts=2 sw=2 sts=2 et: */
 
8
 
 
9
-Components.utils.import("resource://gre/modules/Services.jsm");
 
10
-Components.utils.import("resource://gre/modules/NetUtil.jsm");
 
11
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
12
+const Cu = Components.utils;
 
13
+const Ci = Components.interfaces;
 
14
+const Cr = Components.results;
 
15
+
 
16
+Cu.import("resource://gre/modules/Services.jsm");
 
17
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
18
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
19
 
 
20
 const XULAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1";
 
21
 const XULAPPINFO_CID = Components.ID("{c763b610-9d49-455a-bbd2-ede71682a1ac}");
 
22
@@ -38,23 +42,23 @@
 
23
     invalidateCachesOnRestart: function invalidateCachesOnRestart() {},
 
24
 
 
25
     QueryInterface: function QueryInterface(iid) {
 
26
-      if (iid.equals(Components.interfaces.nsIXULAppInfo)
 
27
-       || iid.equals(Components.interfaces.nsIXULRuntime)
 
28
-       || iid.equals(Components.interfaces.nsISupports))
 
29
+      if (iid.equals(Ci.nsIXULAppInfo)
 
30
+       || iid.equals(Ci.nsIXULRuntime)
 
31
+       || iid.equals(Ci.nsISupports))
 
32
         return this;
 
33
 
 
34
-      throw Components.results.NS_ERROR_NO_INTERFACE;
 
35
+      throw Cr.NS_ERROR_NO_INTERFACE;
 
36
     }
 
37
   };
 
38
 
 
39
   var XULAppInfoFactory = {
 
40
     createInstance: function (outer, iid) {
 
41
       if (outer != null)
 
42
-        throw Components.results.NS_ERROR_NO_AGGREGATION;
 
43
+        throw Cr.NS_ERROR_NO_AGGREGATION;
 
44
       return gXULAppInfo.QueryInterface(iid);
 
45
     }
 
46
   };
 
47
-  var registrar = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
 
48
+  var registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
 
49
   registrar.registerFactory(XULAPPINFO_CID, "XULAppInfo",
 
50
                             XULAPPINFO_CONTRACTID, XULAppInfoFactory);
 
51
 }
 
52
@@ -62,6 +66,44 @@
 
53
 // Need to create and register a profile folder.
 
54
 var gProfD = do_get_profile();
 
55
 
 
56
+var provider = {
 
57
+  getFile: function() {
 
58
+    throw Cr.NS_ERROR_FAILURE;
 
59
+  },
 
60
+
 
61
+  getFiles: function(prop) {
 
62
+    if (prop == "XREExtDL") {
 
63
+      return {
 
64
+        getNext: function() {
 
65
+          throw Cr.NS_ERROR_FAILURE;
 
66
+        },
 
67
+        hasMoreElements: function() {
 
68
+          return false;
 
69
+        },
 
70
+        QueryInterface: function(iid) {
 
71
+          if (iid.equals(Ci.nsISimpleEnumerator) ||
 
72
+              iid.equals(Ci.nsISupports)) {
 
73
+            return this;
 
74
+          }
 
75
+          throw Cr.NS_ERROR_NO_INTERFACE;
 
76
+        }
 
77
+      };
 
78
+    }
 
79
+    throw Cr.NS_ERROR_FAILURE;
 
80
+  },
 
81
+
 
82
+  QueryInterface: function(iid) {
 
83
+    if (iid.equals(Ci.nsIDirectoryServiceProvider2) ||
 
84
+        iid.equals(Ci.nsIDirectoryServiceProvider) ||
 
85
+        iid.equals(Ci.nsISupports)) {
 
86
+      return this;
 
87
+    }
 
88
+    throw Cr.NS_ERROR_NO_INTERFACE;
 
89
+  }
 
90
+};
 
91
+
 
92
+Services.dirsvc.registerProvider(provider);
 
93
+
 
94
 function dumpn(text)
 
95
 {
 
96
   dump("search test: " + text + "\n");
 
97
@@ -102,7 +144,7 @@
 
98
 }
 
99
 
 
100
 function  parseJsonFromStream(aInputStream) {
 
101
-  const json = Cc["@mozilla.org/dom/json;1"].createInstance(Components.interfaces.nsIJSON);
 
102
+  const json = Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON);
 
103
   const data = json.decodeFromStream(aInputStream, aInputStream.available());
 
104
   return data;
 
105
 }