Changeset 196084 in webkit

Timestamp:

Feb 3, 2016 3:01:23 PM (8 years ago)

Author:

Brent Fulgham

Message:

REGRESSION: LayoutTest http/tests/plugins/visible_plugins.html failing on Yosemite WK1
​https://bugs.webkit.org/show_bug.cgi?id=153752

Reviewed by Alexey Proskuryakov.

Revise test to skip the plugins we expect to be displayed, and only display plugins
that are surprising.

• http/tests/plugins/visible_plugins.html:
• http/tests/plugins/visible_plugins-expected.txt:
• platform/mac-wk2/http/tests/plugins/visible_plugins-expected.txt: Removed.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/plugins/visible_plugins-expected.txt (modified) (1 diff)
• http/tests/plugins/visible_plugins.html (modified) (2 diffs)
• platform/mac-wk2/http/tests/plugins/visible_plugins-expected.txt (deleted)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-03  Brent Fulgham  <bfulgham@apple.com>
+
+        REGRESSION: LayoutTest http/tests/plugins/visible_plugins.html failing on Yosemite WK1
+        https://bugs.webkit.org/show_bug.cgi?id=153752
+
+        Reviewed by Alexey Proskuryakov.
+
+        Revise test to skip the plugins we expect to be displayed, and only display plugins
+        that are surprising.
+
+        * http/tests/plugins/visible_plugins.html:
+        * http/tests/plugins/visible_plugins-expected.txt:
+        * platform/mac-wk2/http/tests/plugins/visible_plugins-expected.txt: Removed.
+
 2016-02-03  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/http/tests/plugins/visible_plugins-expected.txt

@@ -1 +1 @@
 Check we only display the valid set of "public" plugins.
 
-None
+PASS: No unexpected plugins were found.

trunk/LayoutTests/http/tests/plugins/visible_plugins.html

@@ -10 +10 @@
     }
 
-    var pluginList = "";
+    var unexpectedPlugins = [];
     Array.prototype.forEach.call(navigator.plugins, function(plugin) {
-        if (pluginList.length)
-            pluginList = pluginList + "\n";
-        pluginList = pluginList + plugin.name;
+        if (plugin.name.match(/Shockwave/i))
+            return;
+        if (plugin.name.match(/QuickTime/i))
+            return;
+        if (plugin.name.match(/Java/i))
+            return;
+        if (plugin.name.match(/WebKit built-in PDF/i))
+            return;
+
+        unexpectedPlugins.push(plugin.name);
     });
 
-    if (pluginList.length)
-        document.getElementById("result").innerText = pluginList;
+    if (unexpectedPlugins.length)
+        document.getElementById("result").innerText = "FAIL: Unexpected plugins: " + unexpectedPlugins.toString();
+    else
+        document.getElementById("result").innerText = "PASS: No unexpected plugins were found."
     if (window.testRunner)
         testRunner.notifyDone();
@@ -28 +37 @@
     Check we only display the valid set of "public" plugins.
 </p>
-<div id="result">None</div>
+<div id="result">TEST DID NOT RUN</div>
 </body>
 </html>