Title: [196084] trunk/LayoutTests
Revision
196084
Author
[email protected]
Date
2016-02-03 15:01:23 -0800 (Wed, 03 Feb 2016)

Log 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.

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (196083 => 196084)


--- trunk/LayoutTests/ChangeLog	2016-02-03 22:59:39 UTC (rev 196083)
+++ trunk/LayoutTests/ChangeLog	2016-02-03 23:01:23 UTC (rev 196084)
@@ -1,3 +1,17 @@
+2016-02-03  Brent Fulgham  <[email protected]>
+
+        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  <[email protected]>
 
         Skip http/tests/contentdispositionattachmentsandbox/form-submission-disabled.html on ios-simulator until it can be rewritten.

Modified: trunk/LayoutTests/http/tests/plugins/visible_plugins-expected.txt (196083 => 196084)


--- trunk/LayoutTests/http/tests/plugins/visible_plugins-expected.txt	2016-02-03 22:59:39 UTC (rev 196083)
+++ trunk/LayoutTests/http/tests/plugins/visible_plugins-expected.txt	2016-02-03 23:01:23 UTC (rev 196084)
@@ -1,3 +1,3 @@
 Check we only display the valid set of "public" plugins.
 
-None
+PASS: No unexpected plugins were found.

Modified: trunk/LayoutTests/http/tests/plugins/visible_plugins.html (196083 => 196084)


--- trunk/LayoutTests/http/tests/plugins/visible_plugins.html	2016-02-03 22:59:39 UTC (rev 196083)
+++ trunk/LayoutTests/http/tests/plugins/visible_plugins.html	2016-02-03 23:01:23 UTC (rev 196084)
@@ -9,15 +9,24 @@
         internals.setShowAllPlugins(false);
     }
 
-    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();
 }
@@ -27,6 +36,6 @@
 <p>
     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>

Deleted: trunk/LayoutTests/platform/mac-wk2/http/tests/plugins/visible_plugins-expected.txt (196083 => 196084)


--- trunk/LayoutTests/platform/mac-wk2/http/tests/plugins/visible_plugins-expected.txt	2016-02-03 22:59:39 UTC (rev 196083)
+++ trunk/LayoutTests/platform/mac-wk2/http/tests/plugins/visible_plugins-expected.txt	2016-02-03 23:01:23 UTC (rev 196084)
@@ -1,3 +0,0 @@
-Check we only display the valid set of "public" plugins.
-
-WebKit built-in PDF
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to