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

Fix/6854 #6855

Merged
merged 3 commits into from
Apr 11, 2022
Merged

Fix/6854 #6855

merged 3 commits into from
Apr 11, 2022

Conversation

drew2a
Copy link
Contributor

@drew2a drew2a commented Apr 11, 2022

This PR fixes #6854

There are three main changes in this PR:

  1. All @pytest.mark.timeout have been removed to derive global timeout settings
  2. For the macos pytest's run added a particular timeout PYTEST_TIMEOUT=300
  3. Tunnels tests have been refactored (mostly cosmetic changes)

@drew2a drew2a marked this pull request as ready for review April 11, 2022 10:52
@drew2a drew2a requested review from a team and kozlovsky and removed request for a team April 11, 2022 10:52
Copy link
Contributor

@kozlovsky kozlovsky left a comment

Choose a reason for hiding this comment

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

Note that for tunnel tests the timeout is (probably mistakenly) specified in conftest.py:

def pytest_collection_modifyitems(config, items):
    for item in items:
        item.add_marker(pytest.mark.timeout(30))

I think it should be removed as well

@drew2a
Copy link
Contributor Author

drew2a commented Apr 11, 2022

@kozlovsky wow, yes. I'll remove it.

@drew2a drew2a merged commit 32a12d8 into Tribler:main Apr 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Macos tests failed due to timeout
2 participants