Bug 86107 – don't use autoinstall to import pywebsocket but check it in WebKit directly

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Takashi Toyoshima]

Currently, we use webkitpy's autoinstall mechanism. But it causes wasteful network traffic by many bots and also is weak at hosting server's flakiness.
Fortunately, the license of pywebsocket is compatible to one of WebKit.
It must be better to check it into WebKit directory than using autoinstall.

[Takashi Toyoshima]

Created attachment 141186 [details]
Patch

[Takashi Toyoshima]

Created attachment 141187 [details]
Patch

[Takashi Toyoshima]

Hi Adam,

as we discussed, I made a change to import pywebsocket directly.
I have two plans now.

My first patch does
 - copy  pywebsocket-0.7.4/src to thirdparty/pywebsocket
 - make empty __init__.py in thirdparty/pywebsocket for python to import it correctly

Second one does
 - copy pywebsocket-0.7.4/src/mod_pywebsocket to thirdparty/mod_pywebsocket
 - copy pywebsocket-0.7.4/src/COPYING to thirdparty/mod_pywebsocket/COPYING

The first plan is more compatible to autoinstall because it copyed in the same way to thirdparty/auoinstall/pywebsocket with empty __init__.py.

The second plan doesn't need additional empty __init__.py and also omit to import misc files containing test and example directories. I feel the second one is better because misc files were not used.

Other common changes are
 - remove pywebsocket related codes from thirdparty/__init__.py and thirdparty/__init___unittest.py
 - change pywebsocket import path in layout_tests/servers/websocket_server.py

[Adam Barth]

Comment on attachment 141187 [details]
Patch

Thanks.

[Adam Barth]

> The second plan doesn't need additional empty __init__.py and also omit to import misc files containing test and example directories. I feel the second one is better because misc files were not used.

Agreed.

[WebKit Review Bot]

Comment on attachment 141187 [details]
Patch

Clearing flags on attachment: 141187

Committed r116668: <http://trac.webkit.org/changeset/116668>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.