Bug 32258 - Rename fast/websockets to fast/websocket
Summary: Rename fast/websockets to fast/websocket
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Alexey Proskuryakov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-12-07 16:49 PST by Alexey Proskuryakov
Modified: 2010-01-21 22:02 PST (History)
2 users (show)

See Also:


Attachments
Patch (8.39 KB, patch)
2010-01-21 01:28 PST, Fumitoshi Ukai
hamaji: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alexey Proskuryakov 2009-12-07 16:49:31 PST
Make it match the root-level websocket directory - I can never remember how each is spelled.
Comment 1 Alexey Proskuryakov 2009-12-07 16:51:52 PST
On the other hand, maybe I shouldn't be renaming it, given that we're going to forbid creating WebSockets from file:// resources - so it will need to be merged into the root one anyway.
Comment 2 Fumitoshi Ukai 2010-01-21 01:28:01 PST
Created attachment 47105 [details]
Patch
Comment 3 Shinichiro Hamaji 2010-01-21 01:39:25 PST
Comment on attachment 47105 [details]
Patch

> diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
> index d63a7d9..50d0689 100644
> --- a/LayoutTests/ChangeLog
> +++ b/LayoutTests/ChangeLog
> @@ -1,3 +1,18 @@
> +2010-01-21  Fumitoshi Ukai  <ukai@chromium.org>
> +
> +        Reviewed by NOBODY (OOPS!).
> +
> +        Move fast/websockets into websocket/tests
> +        https://bugs.webkit.org/show_bug.cgi?id=32258
> +
> +        * fast/websockets/script-tests/TEMPLATE.html: Removed.
> +        * fast/websockets/script-tests/websocket-event-target.js: Removed.
> +        * fast/websockets/websocket-event-target-expected.txt: Removed.
> +        * fast/websockets/websocket-event-target.html: Removed.
> +        * websocket/tests/script-tests/websocket-event-target.js: Added.
> +        * websocket/tests/websocket-event-target-expected.txt: Added.
> +        * websocket/tests/websocket-event-target.html: Added.

I guess you forgot to add TEMPLATE.html ? I'm not sure, but if you used git mv create this patch, prepare-ChangeLog should print "Renamed from ..." instead of "Added" ?
Comment 4 Fumitoshi Ukai 2010-01-21 01:44:05 PST
(In reply to comment #3)
> (From update of attachment 47105 [details])
> > diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
> > index d63a7d9..50d0689 100644
> > --- a/LayoutTests/ChangeLog
> > +++ b/LayoutTests/ChangeLog
> > @@ -1,3 +1,18 @@
> > +2010-01-21  Fumitoshi Ukai  <ukai@chromium.org>
> > +
> > +        Reviewed by NOBODY (OOPS!).
> > +
> > +        Move fast/websockets into websocket/tests
> > +        https://bugs.webkit.org/show_bug.cgi?id=32258
> > +
> > +        * fast/websockets/script-tests/TEMPLATE.html: Removed.
> > +        * fast/websockets/script-tests/websocket-event-target.js: Removed.
> > +        * fast/websockets/websocket-event-target-expected.txt: Removed.
> > +        * fast/websockets/websocket-event-target.html: Removed.
> > +        * websocket/tests/script-tests/websocket-event-target.js: Added.
> > +        * websocket/tests/websocket-event-target-expected.txt: Added.
> > +        * websocket/tests/websocket-event-target.html: Added.
> 
> I guess you forgot to add TEMPLATE.html ? 

I think TEMPLATE.html already exists in websocket/tests/script-tests/

> I'm not sure, but if you used git mv
> create this patch, prepare-ChangeLog should print "Renamed from ..." instead of
> "Added" ?

Hmm, git status shows "renamed: LayoutTests/fast/websockets/script-tests/websocket-event-target.js -> LayotuTests/websocket/tests/script-tests/websocket-event-target.js" or so, but "webkit-patch prepare" provided the ChangeLog as in attachment.
Comment 5 Shinichiro Hamaji 2010-01-21 01:51:30 PST
Comment on attachment 47105 [details]
Patch

Thanks for the clarifications!

> > I guess you forgot to add TEMPLATE.html ? 
> 
> I think TEMPLATE.html already exists in websocket/tests/script-tests/

Ah, I see. I didn't notice that. Looks good then.

> Hmm, git status shows "renamed:
> LayoutTests/fast/websockets/script-tests/websocket-event-target.js ->
> LayotuTests/websocket/tests/script-tests/websocket-event-target.js" or so, but
> "webkit-patch prepare" provided the ChangeLog as in attachment.

I guess it's because you changed the content slightly?
Comment 6 Alexey Proskuryakov 2010-01-21 08:34:59 PST
I doubt that directory rename will be landed correctly from a git checkout; please commit this change using svn to preserve file histories.
Comment 7 Fumitoshi Ukai 2010-01-21 22:02:09 PST
Committed r53676: <http://trac.webkit.org/changeset/53676>