Bug 1203159 - Clean up various tests after DevTools resource move. r=me
authorJ. Ryan Stinnett <jryans@gmail.com>
Thu, 15 Oct 2015 23:30:06 -0500
changeset 303880 4d1344a56f2cedfa999a2fd37d3596aef1eb5e42
parent 303879 3d34494a6881727c92b5aaafb6c9bc2a3398e051
child 303881 f029ccdee154bdc2b49a1e0fcd5b0fa0397aa97b
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1203159
milestone44.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 1203159 - Clean up various tests after DevTools resource move. r=me
browser/base/content/test/general/browser_parsable_css.js
devtools/server/tests/unit/xpcshell.ini
devtools/shared/acorn/tests/unit/xpcshell.ini
devtools/shared/apps/tests/unit/xpcshell.ini
devtools/shared/discovery/tests/unit/xpcshell.ini
devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
devtools/shared/jsbeautify/tests/unit/xpcshell.ini
devtools/shared/performance/test/xpcshell.ini
devtools/shared/pretty-fast/tests/unit/xpcshell.ini
devtools/shared/qrcode/tests/unit/xpcshell.ini
devtools/shared/security/tests/unit/xpcshell.ini
devtools/shared/tests/unit/test_invisible_loader.js
devtools/shared/tests/unit/xpcshell.ini
devtools/shared/transport/tests/unit/xpcshell.ini
devtools/shared/webconsole/test/unit/xpcshell.ini
dom/plugins/test/unit/xpcshell.ini
netwerk/test/unit/xpcshell.ini
security/manager/ssl/tests/unit/xpcshell.ini
--- a/browser/base/content/test/general/browser_parsable_css.js
+++ b/browser/base/content/test/general/browser_parsable_css.js
@@ -20,17 +20,17 @@ const kWhitelist = [
   // TokBox SDK assets, see bug 1032469.
   {sourceName: /loop\/.*sdk-content\/.*\.css$/i},
   // Loop standalone client CSS uses placeholder cross browser pseudo-element
   {sourceName: /loop\/.*\.css/i,
    errorMessage: /Unknown pseudo-class.*placeholder/i},
   {sourceName: /loop\/.*shared\/css\/common.css/i,
    errorMessage: /Unknown property 'user-select'/i},
   // Highlighter CSS uses chrome-only pseudo-class, see bug 985597.
-  {sourceName: /highlighter\.css/i,
+  {sourceName: /highlighters\.css/i,
    errorMessage: /Unknown pseudo-class.*moz-native-anonymous/i},
 ];
 
 var moduleLocation = gTestPath.replace(/\/[^\/]*$/i, "/parsingTestHelpers.jsm");
 var {generateURIsFromDirTree} = Cu.import(moduleLocation, {});
 
 /**
  * Check if an error should be ignored due to matching one of the whitelist
--- a/devtools/server/tests/unit/xpcshell.ini
+++ b/devtools/server/tests/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 tags = devtools
 head = head_dbg.js
 tail =
+firefox-appdir = browser
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 support-files =
   babel_and_browserify_script_with_source_map.js
   source-map-data/sourcemapped.coffee
   source-map-data/sourcemapped.map
   post_init_global_actors.js
   post_init_tab_actors.js
--- a/devtools/shared/acorn/tests/unit/xpcshell.ini
+++ b/devtools/shared/acorn/tests/unit/xpcshell.ini
@@ -1,9 +1,10 @@
-[DEFAULT]
-tags = devtools
-head = head_acorn.js
-tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
-
-[test_import_acorn.js]
-[test_same_ast.js]
-[test_lenient_parser.js]
+[DEFAULT]
+tags = devtools
+head = head_acorn.js
+tail =
+firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
+
+[test_import_acorn.js]
+[test_same_ast.js]
+[test_lenient_parser.js]
--- a/devtools/shared/apps/tests/unit/xpcshell.ini
+++ b/devtools/shared/apps/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 tags = devtools
 head = head_apps.js
 tail = tail_apps.js
+firefox-appdir = browser
 skip-if = toolkit == 'android' || (toolkit == 'gonk' && debug) # Bug 1206586
 support-files =
   data/app.zip
   data/app-engineering.zip
 
 [test_webappsActor.js]
 skip-if = buildapp == "b2g"
--- a/devtools/shared/discovery/tests/unit/xpcshell.ini
+++ b/devtools/shared/discovery/tests/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 tags = devtools
 head =
 tail =
+firefox-appdir = browser
 
 [test_discovery.js]
 skip-if = toolkit == 'gonk' # Disabled per Bug 1140913
--- a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
+++ b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 tags = devtools heapsnapshot
 head = head_heapsnapshot.js
 tail =
+firefox-appdir = browser
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 support-files =
   Census.jsm
   heap-snapshot-worker.js
   Match.jsm
 
 [test_census_diff_01.js]
--- a/devtools/shared/jsbeautify/tests/unit/xpcshell.ini
+++ b/devtools/shared/jsbeautify/tests/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 tags = devtools
 head = head_jsbeautify.js
 tail =
+firefox-appdir = browser
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test.js]
--- a/devtools/shared/performance/test/xpcshell.ini
+++ b/devtools/shared/performance/test/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 tags = devtools
 head = head.js
 tail =
+firefox-appdir = browser
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_perf-utils-allocations-to-samples.js]
--- a/devtools/shared/pretty-fast/tests/unit/xpcshell.ini
+++ b/devtools/shared/pretty-fast/tests/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 tags = devtools
 head = head_pretty-fast.js
 tail =
+firefox-appdir = browser
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test.js]
--- a/devtools/shared/qrcode/tests/unit/xpcshell.ini
+++ b/devtools/shared/qrcode/tests/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 tags = devtools
 head =
 tail =
+firefox-appdir = browser
 skip-if = toolkit == 'gonk' && debug # Bug 1206586
 
 [test_encode.js]
--- a/devtools/shared/security/tests/unit/xpcshell.ini
+++ b/devtools/shared/security/tests/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 tags = devtools
 head = head_dbg.js
 tail =
+firefox-appdir = browser
 skip-if = toolkit == 'gonk' && debug # Bug 1206586
 
 support-files=
   testactors.js
 
 [test_cert.js]
 [test_encryption.js]
 [test_oob_cert_auth.js]
--- a/devtools/shared/tests/unit/test_invisible_loader.js
+++ b/devtools/shared/tests/unit/test_invisible_loader.js
@@ -1,16 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 Cu.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
-const COLOR_URI = "resource://devtools/css-color.js";
-
 /**
  * Ensure that sandboxes created via the Dev Tools loader respect the
  * invisibleToDebugger flag.
  */
 function run_test() {
   visible_loader();
   invisible_loader();
 }
--- a/devtools/shared/tests/unit/xpcshell.ini
+++ b/devtools/shared/tests/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 tags = devtools
 head = head_devtools.js
 tail =
+firefox-appdir = browser
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   exposeLoader.js
 
 [test_assert.js]
 [test_fetch-chrome.js]
 [test_fetch-file.js]
 [test_fetch-http.js]
--- a/devtools/shared/transport/tests/unit/xpcshell.ini
+++ b/devtools/shared/transport/tests/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 tags = devtools
 head = head_dbg.js
 tail =
+firefox-appdir = browser
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 support-files =
   testactors.js
   testactors-no-bulk.js
 
 [test_bulk_error.js]
 [test_client_server_bulk.js]
--- a/devtools/shared/webconsole/test/unit/xpcshell.ini
+++ b/devtools/shared/webconsole/test/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 tags = devtools
 head =
 tail =
+firefox-appdir = browser
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
 
 [test_js_property_provider.js]
 [test_network_helper.js]
 [test_security-info-certificate.js]
 [test_security-info-parser.js]
 [test_security-info-protocol-version.js]
--- a/dom/plugins/test/unit/xpcshell.ini
+++ b/dom/plugins/test/unit/xpcshell.ini
@@ -1,13 +1,14 @@
 [DEFAULT]
 skip-if = buildapp == 'mulet' || toolkit == 'android' || toolkit == 'gonk'
 head = head_plugins.js
-tail = 
+tail =
 tags = addons
+firefox-appdir = browser
 
 [test_allowed_types.js]
 skip-if = appname == "thunderbird"
 reason = plugins are disabled by default in Thunderbird
 [test_bug455213.js]
 # Bug 676953: test fails consistently on Android
 fail-if = os == "android"
 [test_bug471245.js]
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -123,17 +123,17 @@ requesttimeoutfactor = 2
 [test_bug468594.js]
 [test_bug470716.js]
 [test_bug477578.js]
 [test_bug479413.js]
 [test_bug479485.js]
 [test_bug482601.js]
 [test_bug484684.js]
 [test_bug490095.js]
-# Bug 675039: intermittent fail on Android-armv6 
+# Bug 675039: intermittent fail on Android-armv6
 skip-if = os == "android"
 [test_bug504014.js]
 [test_bug510359.js]
 [test_bug515583.js]
 [test_bug528292.js]
 [test_bug536324_64bit_content_length.js]
 [test_bug540566.js]
 [test_bug543805.js]
@@ -314,16 +314,17 @@ skip-if = os != "win"
 [test_synthesized_response.js]
 [test_udp_multicast.js]
 [test_redirect_history.js]
 [test_reply_without_content_type.js]
 [test_websocket_offline.js]
 [test_tls_server.js]
 # The local cert service used by this test is not currently shipped on Android
 skip-if = os == "android"
+firefox-appdir = browser
 [test_1073747.js]
 [test_multipart_streamconv_application_package.js]
 [test_safeoutputstream_append.js]
 [test_packaged_app_service.js]
 [test_packaged_app_verifier.js]
 [test_packaged_app_utils.js]
 [test_suspend_channel_before_connect.js]
 [test_inhibit_caching.js]
--- a/security/manager/ssl/tests/unit/xpcshell.ini
+++ b/security/manager/ssl/tests/unit/xpcshell.ini
@@ -146,9 +146,10 @@ run-sequentially = hardcoded ports
 [test_nsIX509Cert_utf8.js]
 [test_constructX509FromBase64.js]
 [test_validity.js]
 run-sequentially = hardcoded ports
 [test_certviewer_invalid_oids.js]
 skip-if = toolkit == 'android' || buildapp == 'b2g'
 
 [test_weak_crypto.js]
+firefox-appdir = browser
 skip-if = toolkit == 'android'