Bug 59930 – Make fast/dom/object-embed-plugin-scripting.html compatible with non-Mac ports

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Robert Hogan]

Move fast/dom/object-embed-plugin-scripting.html to plugins/ and change it to use the test plugin rather than quicktime. This allows it to pass on Qt and Chromium Linux ports.

[Robert Hogan]

Created attachment 91914 [details]
Patch

[Robert Hogan]

Created attachment 91915 [details]
Patch

[Eric Seidel (no email)]

Comment on attachment 91915 [details]
Patch

LGTM.

[WebKit Commit Bot]

Comment on attachment 91915 [details]
Patch

Rejecting attachment 91915 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'apply-..." exit_code: 2

Last 500 characters of output:
rm/chromium/test_expectations.txt
patching file LayoutTests/platform/qt/Skipped
patching file LayoutTests/plugins/object-embed-plugin-scripting-expected.txt
patching file LayoutTests/plugins/object-embed-plugin-scripting.html
LayoutTests/plugins/resources/apple.gif: unknown git binary patch format at /mnt/git/webkit-commit-queue/Tools/Scripts/VCSUtils.pm line 1825.

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 29

Full output: http://queues.webkit.org/results/8533416

[Eric Seidel (no email)]

Looks like svn-apply is still sick?

[Robert Hogan]

Created attachment 92978 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 92978 [details]
Patch

Rejecting attachment 92978 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'apply-..." exit_code: 2

Last 500 characters of output:
m bug 59930.
Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 2

Parsed 5 diffs from patch file(s).
patching file LayoutTests/ChangeLog
patch: **** Only garbage was found in the patch input.
rm 'LayoutTests/fast/dom/resources/articles.m4a'
patching file LayoutTests/platform/chromium/test_expectations.txt
patching file LayoutTests/platform/qt/Skipped

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 2

Full output: http://queues.webkit.org/results/8684044

[Daniel Bates]

(In reply to comment #6)
> Created an attachment (id=92978) [details]
> Patch

How did you create this patch?

[Robert Hogan]

(In reply to comment #8)
> (In reply to comment #6)
> > Created an attachment (id=92978) [details] [details]
> > Patch
> 
> How did you create this patch?

git. is there something wrong with props of the gif?

[Daniel Bates]

(In reply to comment #9)
> (In reply to comment #8)
> > (In reply to comment #6)
> > > Created an attachment (id=92978) [details] [details] [details]
> > > Patch
> > 
> > How did you create this patch?
> 
> git. is there something wrong with props of the gif?

No. The issue is that this patch contains a diff that removes an empty file. Unfortunately svn-{apply, unapply} fails to handle such diffs. We need to fix bug #29684. Therefore, we cannot land this patch via the commit queue; => we will need to land this patch by hand.

[Daniel Bates]

(In reply to comment #10)
> No. The issue is that this patch contains a diff that removes an empty file. 

For completeness, the empty file that is being removed is LayoutTests/fast/dom/resources/articles.m4a.

[Robert Hogan]

Committed r86440: <http://trac.webkit.org/changeset/86440>

[Csaba Osztrogonác]

(In reply to comment #12)
> Committed r86440: <http://trac.webkit.org/changeset/86440>

fast/dom/object-embed-plugin-scripting.html fails on our Qt Snow Leopard bot:
http://build.webkit.sed.hu/waterfall

Could you fix it, or add this test to qt-mac/Skipped list?


--- /buildbot/snowleopard-qt-release/snowleopard-qt-intel-release/build/layout-test-results/plugins/object-embed-plugin-scripting-expected.txt	2011-05-14 01:59:22.000000000 -0700
+++ /buildbot/snowleopard-qt-release/snowleopard-qt-intel-release/build/layout-test-results/plugins/object-embed-plugin-scripting-actual.txt	2011-05-14 01:59:22.000000000 -0700
@@ -2,22 +2,22 @@
 
 Each test below states its expected outcome.
 
-plugin <object> with nested plugin <embed>: should have a plugin and does
+plugin <object> with nested plugin <embed>: should have a plugin and does not
 
-plugin <embed> netsted in plugin <object>: should have a plugin and does
+plugin <embed> netsted in plugin <object>: should have a plugin and does not
 
 empty <object> with nested plugin <embed>: should not have a plugin and does not
 
-plugin <embed> nested in empty <object>: should have a plugin and does
+plugin <embed> nested in empty <object>: should have a plugin and does not
 
 plugin <embed> nested in image <object>: should not have a plugin and does not
 
 plugin <embed> nested in empty <object> nested in plugin <object>: should not have a plugin and does not
 
-standalone plugin <embed>: should have a plugin and does
+standalone plugin <embed>: should have a plugin and does not
 
-plugin <object> with nested plugin <embed> of the same name should have a plugin and does
+plugin <object> with nested plugin <embed> of the same name should have a plugin and does not
 
-empty <object> with nested plugin <embed> of the same name should have a plugin and does
+empty <object> with nested plugin <embed> of the same name should have a plugin and does not

[Csaba Osztrogonác]

Robert, could you make the Qt Mac bot green again, please?

[Robert Hogan]

Created attachment 93672 [details]
Patch

[Csaba Osztrogonác]

Comment on attachment 93672 [details]
Patch

r=me

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 93672 [details]:

http/tests/websocket/tests/bad-handshake-crash.html bug 54370 (author: [e-mail])
The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 93672 [details]
Patch

Clearing flags on attachment: 93672

Committed r86613: <http://trac.webkit.org/changeset/86613>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.