Bug 1286435 - include extension zip/xpi files in JS and CSS parsing tests, r=jaws
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 19 Jul 2016 23:01:37 +0100
changeset 305519 4425ad9e484976de55891ae77e17d7c1ac0b5ec2
parent 305518 8a26f6b014e67c5829f2c2a28b82f9b28fc0737d
child 305520 7c026e26932d9e32d0a7c7fdef330917c52a9620
push id30701
push userjwein@mozilla.com
push dateTue, 19 Jul 2016 22:14:48 +0000
treeherderautoland@4425ad9e4849 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1286435
milestone50.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 1286435 - include extension zip/xpi files in JS and CSS parsing tests, r=jaws MozReview-Commit-ID: GgTQkvkrvDo
browser/base/content/test/general/browser_parsable_css.js
browser/base/content/test/general/parsingTestHelpers.jsm
--- a/browser/base/content/test/general/browser_parsable_css.js
+++ b/browser/base/content/test/general/browser_parsable_css.js
@@ -18,17 +18,17 @@ const kWhitelist = [
   // Tracked in bug 1004428.
   {sourceName: /aboutaccounts\/(main|normalize)\.css$/i},
   // 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},
+   errorMessage: /Unknown property .user-select./i},
   // Highlighter CSS uses a UA-only pseudo-class, see bug 985597.
   {sourceName: /highlighters\.css$/i,
    errorMessage: /Unknown pseudo-class.*moz-native-anonymous/i},
   // Responsive Design Mode CSS uses a UA-only pseudo-class, see Bug 1241714.
   {sourceName: /responsive-ua\.css$/i,
    errorMessage: /Unknown pseudo-class.*moz-dropdown-list/i},
 ];
 
--- a/browser/base/content/test/general/parsingTestHelpers.jsm
+++ b/browser/base/content/test/general/parsingTestHelpers.jsm
@@ -65,17 +65,18 @@ function iterateOverPath(path, extension
       let file = parentDir.clone();
       file.append(entry.name);
       // the build system might leave dead symlinks hanging around, which are
       // returned as part of the directory iterator, but don't actually exist:
       if (file.exists()) {
         let uriSpec = getURLForFile(file);
         files.push(Services.io.newURI(uriSpec, null, null));
       }
-    } else if (entry.name.endsWith(".ja") || entry.name.endsWith(".jar")) {
+    } else if (entry.name.endsWith(".ja") || entry.name.endsWith(".jar") ||
+               entry.name.endsWith(".zip") || entry.name.endsWith(".xpi")) {
       let file = parentDir.clone();
       file.append(entry.name);
       for (let extension of extensions) {
         let jarEntryIterator = generateEntriesFromJarFile(file, extension);
         files.push(...jarEntryIterator);
       }
     }
   };