Skip to content

Update client/server implementation in the autobahn tests#5637

Merged
webknjaz merged 5 commits intoaio-libs:masterfrom
wfatherley:5606-update-autobahn
May 16, 2021
Merged

Update client/server implementation in the autobahn tests#5637
webknjaz merged 5 commits intoaio-libs:masterfrom
wfatherley:5606-update-autobahn

Conversation

@wfatherley
Copy link
Copy Markdown
Contributor

@wfatherley wfatherley commented Apr 20, 2021

What do these changes do?

Alters autobahn client and server tests by updating deprecated syntax

Are there changes in behavior for the user?

No, there should not be

Related issue number

Resolves #5606

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES folder
    • name it <issue_id>.<type> for example (588.bugfix)
    • if you don't have an issue_id change it to the pr id after creating the pr
    • ensure type is one of the following:
      • .feature: Signifying a new feature.
      • .bugfix: Signifying a bug fix.
      • .doc: Signifying a documentation improvement.
      • .removal: Signifying a deprecation or removal of public API.
      • .misc: A ticket has been closed, but it is not of interest to users.
    • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

@wfatherley wfatherley requested a review from asvetlov as a code owner April 20, 2021 21:41
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Apr 20, 2021
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 20, 2021

Codecov Report

Merging #5637 (1106d17) into master (407f708) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #5637   +/-   ##
=======================================
  Coverage   97.17%   97.17%           
=======================================
  Files          41       41           
  Lines        8865     8865           
  Branches     1425     1425           
=======================================
  Hits         8615     8615           
  Misses        133      133           
  Partials      117      117           
Flag Coverage Δ
unit 97.06% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 407f708...1106d17. Read the comment docs.

@wfatherley
Copy link
Copy Markdown
Contributor Author

Used the crosbario/autobahn-testsuite:0.8.2 Docker image.

@wfatherley wfatherley requested a review from webknjaz as a code owner April 21, 2021 12:15
@greshilov
Copy link
Copy Markdown
Contributor

@webknjaz PTAL

Copy link
Copy Markdown
Contributor

@greshilov greshilov left a comment

Choose a reason for hiding this comment

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

Thanks!

@webknjaz webknjaz changed the title 5606 update autobahn Update client/server implementation in the autobahn tests Apr 25, 2021
@webknjaz webknjaz enabled auto-merge (squash) April 25, 2021 19:48
@Dreamsorcerer
Copy link
Copy Markdown
Member

What's happening with these tests? There was a build failure for Windows, so I tried rerunning them, but now they aren't running at all...

@webknjaz webknjaz merged commit 6fb3efc into aio-libs:master May 16, 2021
@webknjaz
Copy link
Copy Markdown
Member

I'm curious if that's related with today's GHA outage

@patchback
Copy link
Copy Markdown
Contributor

patchback bot commented May 16, 2021

Backport to 3.8: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 6fb3efc on top of patchback/backports/3.8/6fb3efc4b5dd971e3f0e1080435fead757f15eaa/pr-5637

Backporting merged PR #5637 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git add remote upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.8/6fb3efc4b5dd971e3f0e1080435fead757f15eaa/pr-5637 upstream/3.8
  4. Now, cherry-pick PR Update client/server implementation in the autobahn tests #5637 contents into that branch:
    $ git cherry-pick -x 6fb3efc4b5dd971e3f0e1080435fead757f15eaa
    If it'll yell at you with something like fatal: Commit 6fb3efc4b5dd971e3f0e1080435fead757f15eaa is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 6fb3efc4b5dd971e3f0e1080435fead757f15eaa
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Update client/server implementation in the autobahn tests #5637 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/6fb3efc4b5dd971e3f0e1080435fead757f15eaa/pr-5637
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@webknjaz
Copy link
Copy Markdown
Member

@wefatherley mind backporting this?

@wfatherley
Copy link
Copy Markdown
Contributor Author

Sure thing

@wfatherley
Copy link
Copy Markdown
Contributor Author

It seems swapping out the deprecated _make_handler syntax can be backported to 3.2, while swapping out deprecated ws_connect syntax can be backported to 3.0? Does the cherry picker handle this on it's own?

@webknjaz
Copy link
Copy Markdown
Member

It only does git cherry-pick -x and that's about it. Normally, if automatic backporting fails, it means that there's manual adjustments to be made.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bot:chronographer:provided There is a change note present in this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Autobahn test needs updating

4 participants