Skip to content

Pywebsocket refactoring#28667

Merged
foolip merged 3 commits intoweb-platform-tests:masterfrom
arenevier:pywebsocket_refactoring
May 13, 2021
Merged

Pywebsocket refactoring#28667
foolip merged 3 commits intoweb-platform-tests:masterfrom
arenevier:pywebsocket_refactoring

Conversation

@arenevier
Copy link

No description provided.

@arenevier
Copy link
Author

@ricea

Copy link
Contributor

@ricea ricea left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

I verified the tools/third_party/pywebsocket3 files are identical to upstream commit 265579a969e1aec2a6457db7674a9e31fbb7d564 .

@arenevier
Copy link
Author

Are the tests failure on windows legitimate failures?
https://dev.azure.com/web-platform-tests/b14026b4-9423-4454-858f-bf76cf6d1faa/_apis/build/builds/64487/logs/203

I don't have a windows machine. But on linux, I can't reproduce when running
$ tox -c tools/wpt/ -e py38 -- --junitxml=results.xml

Copy link
Contributor

@LukeZielinski LukeZielinski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check failures are unrelated (#28745)

@foolip
Copy link
Member

foolip commented May 6, 2021

@arenevier can you try rebasing? Those CI failures should be resolved now.

Also, everyone on this PR might be interested in #28863, which I filed after noticing we're going in an amusing direction :)

Arno Renevier added 3 commits May 6, 2021 09:43
…65579a969

265579a969 Expose base.py as a public api. (#28)
cdb83e3152 Add missing r to regular expression (#27)

git-subtree-dir: tools/third_party/pywebsocket3
git-subtree-split: 265579a969e1aec2a6457db7674a9e31fbb7d564
pywebsocket has been refactored to expose some utilities and base class
as part of its public API.
(see GoogleChromeLabs/pywebsocket3#28)

By updating to the newest pywebsocket3 version, we can make
ws_h2_handshake much simpler
@arenevier
Copy link
Author

@arenevier can you try rebasing? Those CI failures should be resolved now.

Done.

I have separeted in two commits: first the merge obtained with

git subtree pull --prefix tools/third_party/pywebsocket3 https://github.com/GoogleChromeLabs/pywebsocket3 master `--squash

Then, the actual changes to wpt.

I'm not sure if it would be better to squash them.

@foolip
Copy link
Member

foolip commented May 6, 2021

In order to preserve the history correctly and make future git subtree calls work correctly it will be necessary to merge this into wpt with branch protection temporarily disabled.

Right @stephenmcgruer, is that how you've been doing it?

@ricea
Copy link
Contributor

ricea commented May 13, 2021

Ping?

@foolip
Copy link
Member

foolip commented May 13, 2021

@jgraham let me know on IRC that the branch protection rules don't apply to admins, which I can confirm in settings. Makes sense, that's the same reason why admin merging in the UI is allowed. (Force pushing or deleting master is still not allowed for admins, fortunately.)

I'll go ahead and merge this from the command line.

@foolip foolip closed this in 24fa46d May 13, 2021
@foolip foolip merged commit 24fa46d into web-platform-tests:master May 13, 2021
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request May 20, 2021
Automatic update from web-platform-tests
Squashed 'tools/third_party/pywebsocket3/' changes from 9db3d29db4..265579a969

265579a969 Expose base.py as a public api. (#28)
cdb83e3152 Add missing r to regular expression (#27)

git-subtree-dir: tools/third_party/pywebsocket3
git-subtree-split: 265579a969e1aec2a6457db7674a9e31fbb7d564

--
Merge commit '2a247ac52a4af9f82d50b2f96a43abe5c4629ed3' into HEAD

--
update ws_h2_handshake.py to recent pywebsocket

pywebsocket has been refactored to expose some utilities and base class
as part of its public API.
(see GoogleChromeLabs/pywebsocket3#28)

By updating to the newest pywebsocket3 version, we can make
ws_h2_handshake much simpler

--
Merge commit 'ec57f8af52fe5e1074ec2de6a5d0d88c4cab257a'

Closes web-platform-tests/wpt#28667.

--

wpt-commits: 2a247ac52a4af9f82d50b2f96a43abe5c4629ed3, c3c4473d852203e78c4927408aae0b42f95b7385, ec57f8af52fe5e1074ec2de6a5d0d88c4cab257a, 24fa46db564eb4491e9f84edd3d1a07316cc14c6
wpt-pr: 28667
jwidar pushed a commit to jwidar/LatencyZeroGithub that referenced this pull request Sep 16, 2025
Automatic update from web-platform-tests
Squashed 'tools/third_party/pywebsocket3/' changes from 9db3d29db4..265579a969

265579a969 Expose base.py as a public api. (#28)
cdb83e3152 Add missing r to regular expression (#27)

git-subtree-dir: tools/third_party/pywebsocket3
git-subtree-split: 265579a969e1aec2a6457db7674a9e31fbb7d564

--
Merge commit '2a247ac52a4af9f82d50b2f96a43abe5c4629ed3' into HEAD

--
update ws_h2_handshake.py to recent pywebsocket

pywebsocket has been refactored to expose some utilities and base class
as part of its public API.
(see GoogleChromeLabs/pywebsocket3#28)

By updating to the newest pywebsocket3 version, we can make
ws_h2_handshake much simpler

--
Merge commit 'ec57f8af52fe5e1074ec2de6a5d0d88c4cab257a'

Closes web-platform-tests/wpt#28667.

--

wpt-commits: 2a247ac52a4af9f82d50b2f96a43abe5c4629ed3, c3c4473d852203e78c4927408aae0b42f95b7385, ec57f8af52fe5e1074ec2de6a5d0d88c4cab257a, 24fa46db564eb4491e9f84edd3d1a07316cc14c6
wpt-pr: 28667
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants