Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate autobahn tests with pytest #5809

Merged
merged 28 commits into from
Oct 6, 2021
Merged

Integrate autobahn tests with pytest #5809

merged 28 commits into from
Oct 6, 2021

Conversation

anesabml
Copy link
Contributor

What do these changes do?

Automate running autobahn test suite.

Are there changes in behavior for the user?

No.

Related issue number

#4247

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."

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Jun 18, 2021
@anesabml anesabml marked this pull request as draft June 18, 2021 23:29
.github/workflows/ci.yml Outdated Show resolved Hide resolved
CHANGES/4247.feature Outdated Show resolved Hide resolved
requirements/dev.txt Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Jun 28, 2021

Codecov Report

Merging #5809 (c8efa78) into master (e5af76a) will increase coverage by 93.30%.
The diff coverage is 38.33%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #5809       +/-   ##
===========================================
+ Coverage        0   93.30%   +93.30%     
===========================================
  Files           0      102      +102     
  Lines           0    30048    +30048     
  Branches        0     1916     +1916     
===========================================
+ Hits            0    28035    +28035     
- Misses          0     1835     +1835     
- Partials        0      178      +178     
Flag Coverage Δ
unit 93.24% <38.33%> (?)

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

Impacted Files Coverage Δ
tests/autobahn/test_autobahn.py 38.33% <38.33%> (ø)
aiohttp/typedefs.py 100.00% <0.00%> (ø)
tests/test_client_connection.py 98.92% <0.00%> (ø)
tests/test_streams.py 100.00% <0.00%> (ø)
tests/test_proxy_functional.py 62.68% <0.00%> (ø)
tests/test_web_runner.py 86.07% <0.00%> (ø)
tests/test_client_functional.py 98.19% <0.00%> (ø)
aiohttp/web.py 99.15% <0.00%> (ø)
aiohttp/connector.py 93.90% <0.00%> (ø)
tests/test_web_request.py 99.06% <0.00%> (ø)
... and 92 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 e5af76a...c8efa78. Read the comment docs.

.github/workflows/ci.yml Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
@anesabml
Copy link
Contributor Author

@webknjaz Here's a quick update:

  1. I was trying to get docker running on ci and manually install Compose V2 or use docker-compose, but I couldn't figure it out, due to the following reasons:
    a. There's no official way to install Compose V2, you have to manually download the plugin and copy it to ~/.docker/cli-plugins/docker-compose.
    b. GitHub actions macOS runner doesn't have docker installed, I tried installing manually but it's a bit complicated.
  2. I am now trying to figure out how to run autobahn tests using the built-in command tool wstest, I have managed to do so and the tests work fine on my laptop but failing on CI due to missing python2 headers because autobahn test suites require python2.

@webknjaz
Copy link
Member

@anesabml for now, just run this under Linux jobs (use skipif marker in tests).
Also, you don't have to run docker-compose — just using docker could be enough. Why do we need another level of indirection?

@anesabml anesabml marked this pull request as ready for review August 9, 2021 21:11
@anesabml
Copy link
Contributor Author

anesabml commented Aug 9, 2021

@webknjaz is there anything I should add to this PR?

@anesabml
Copy link
Contributor Author

anesabml commented Oct 6, 2021

@webknjaz is there anything I should add to this PR to close it?

@webknjaz
Copy link
Member

webknjaz commented Oct 6, 2021

Sorry I haven't had time to review this sooner. I suppose it's good enough, no need to iterate on improvements forever. Those could be added separately when needed.

@webknjaz webknjaz merged commit a45c7c5 into aio-libs:master Oct 6, 2021
@patchback
Copy link
Contributor

patchback bot commented Oct 6, 2021

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

❌ Failed to cleanly apply a45c7c5 on top of patchback/backports/3.8/a45c7c53e20ccf77f4f6b721157d4a449c0f1208/pr-5809

Backporting merged PR #5809 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 remote add 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/a45c7c53e20ccf77f4f6b721157d4a449c0f1208/pr-5809 upstream/3.8
  4. Now, cherry-pick PR Integrate autobahn tests with pytest #5809 contents into that branch:
    $ git cherry-pick -x a45c7c53e20ccf77f4f6b721157d4a449c0f1208
    If it'll yell at you with something like fatal: Commit a45c7c53e20ccf77f4f6b721157d4a449c0f1208 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x a45c7c53e20ccf77f4f6b721157d4a449c0f1208
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Integrate autobahn tests with pytest #5809 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/a45c7c53e20ccf77f4f6b721157d4a449c0f1208/pr-5809
  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.

@aio-libs-github-bot
Copy link
Contributor

💔 Backport was not successful

The PR was attempted backported to the following branches:

  • ❌ 3.8: Commit could not be cherrypicked due to conflicts

@webknjaz
Copy link
Member

webknjaz commented Oct 8, 2021

@anesabml mind backporting?

@anesabml
Copy link
Contributor Author

@webknjaz sure, I will backport it

@webknjaz
Copy link
Member

Wonderful, thanks!

@anesabml
Copy link
Contributor Author

Here's the PR #6074

asvetlov pushed a commit that referenced this pull request Oct 19, 2021
* Integrate autobahn tests with pytest

* Fix docker compose file paths

* Fix typo in CHANGES file

* Fix add python-on-whales dependency to .in file instead of .txt

* Use pathlib instead of os

* Use buildx instead of compose build

* Regenerate dev requirements

* Rename changes file

* Use request fspath instead of hard coded path

* Create a sepearte builder when building aiohttp

* Use subprocess instead of python-on-whales

* Extract failed tests and make assertions on them

* Fix lint issues

* Fix fixture scope

* Add ports to docker-compose files

* Add wait-for-it package

* Use xfail instead of fail

* Use wstest cmd tool instead of the docker image

* Fix lint issues

* Use assert statement with custom output

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>

* Code cleanup

* Use docker instead of docker-compose

* Add xfail decorator

* Add tmp_path

* Remove gitignore

* Skip tests only on macOS

* Check if docker is available

* Regenerate dev.txt

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
(cherry picked from commit a45c7c5)
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.

3 participants