Bug 51147

Summary: More rebaselining needed for new-run-webkit-tests update
Product: WebKit Reporter: Cosmin Truta <ctruta>
Component: Tools / TestsAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: abarth, aroben, commit-queue, eric
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: All   
OS: All   
Bug Depends on:    
Bug Blocks: 36983    
Attachments:
Description Flags
Rebaseline
jamesr: review-
Rebaseline none

Description Cosmin Truta 2010-12-15 15:34:43 PST
While working on bug 51018, I missed some expectation files that did not show up in my testing.
The regression bug 51135 occurred upon landing the patch for bug 36983.
Comment 1 Cosmin Truta 2010-12-15 15:56:32 PST
Created attachment 76702 [details]
Rebaseline
Comment 2 James Robinson 2010-12-15 16:45:37 PST
Comment on attachment 76702 [details]
Rebaseline

The change to LayoutTests/http/tests/misc/authentication-sent-to-redirect-expected.txt should not be necessary.
Comment 3 Cosmin Truta 2010-12-16 10:27:56 PST
Created attachment 76781 [details]
Rebaseline

In addition to the Chromium-related rebaselining, I am also fixing plugins/document-open.html.
Comment 4 Cosmin Truta 2010-12-16 10:31:48 PST
(In reply to comment #2)
> The change to LayoutTests/http/tests/misc/authentication-sent-to-redirect-expected.txt should not be necessary.

For some odd reason, even with the new change done by the author, I still had to add newlines for this test to the expectation files from platform/chromium-mac/ and platform/chromium-win/.

I tested all rebaselines on chromium-mac and chromium-linux.
Comment 5 WebKit Commit Bot 2010-12-16 10:53:49 PST
Comment on attachment 76781 [details]
Rebaseline

Rejecting attachment 76781 [details] from commit-queue.

Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'apply-attachment', '--non-interactive', 76781]" exit_code: 2
Last 500 characters of output:
ailed to merge in the changes.
Patch failed at 0001 2010-12-16  Yury Semikhatsky  <yurys@chromium.org>

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at WebKitTools/Scripts/update-webkit line 132.

Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2

Full output: http://queues.webkit.org/results/7154067
Comment 6 Cosmin Truta 2010-12-16 11:24:59 PST
(In reply to comment #5)
> (From update of attachment 76781 [details])
> Rejecting attachment 76781 [details] from commit-queue.

I don't understand this failure: "CONFLICT (content): Merge conflict in WebCore/ChangeLog. Failed to merge in the changes."

I did not submit a WebCore/ChangeLog. Could this be another tooling malfunction, perhaps?
Comment 7 Cosmin Truta 2010-12-16 12:44:14 PST
Setting cq? flag again.
Comment 8 WebKit Commit Bot 2010-12-16 13:09:03 PST
Comment on attachment 76781 [details]
Rebaseline

Rejecting attachment 76781 [details] from commit-queue.

Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'apply-attachment', '--non-interactive', 76781]" exit_code: 2
Last 500 characters of output:
ailed to merge in the changes.
Patch failed at 0001 2010-12-16  Yury Semikhatsky  <yurys@chromium.org>

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at WebKitTools/Scripts/update-webkit line 132.

Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2

Full output: http://queues.webkit.org/results/7108087
Comment 9 WebKit Commit Bot 2010-12-16 13:39:43 PST
Comment on attachment 76781 [details]
Rebaseline

Rejecting attachment 76781 [details] from commit-queue.

Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'apply-attachment', '--non-interactive', 76781]" exit_code: 2
Last 500 characters of output:
ailed to merge in the changes.
Patch failed at 0001 2010-12-16  Yury Semikhatsky  <yurys@chromium.org>

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at WebKitTools/Scripts/update-webkit line 132.

Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2

Full output: http://queues.webkit.org/results/7108088
Comment 10 Adam Barth 2010-12-16 13:46:09 PST
Comment on attachment 76781 [details]
Rebaseline

Clearing flags on attachment: 76781

Committed r74211: <http://trac.webkit.org/changeset/74211>
Comment 11 Adam Barth 2010-12-16 13:46:15 PST
All reviewed patches have been landed.  Closing bug.
Comment 12 Eric Seidel (no email) 2010-12-16 14:21:30 PST
Sorry, the queue got upset.  Still not sure how its repository got corrupted so.  I'm fixing it now.