python tests: compatibility and stability improvements #31588
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
botelastic
bot
added
the
needs_team
belimawr
added
backport-skip
botelastic
bot
removed
the
needs_team
belimawr
changed the title
belimawr
force-pushed
the
fix-python-tests-for-python-3.9
branch
2 times, most recently
from
38b34e7
to
cc557e1
Compare
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
💚 Flaky test reportTests succeeded. 🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
belimawr
changed the title
|
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
cmacknz
reviewed
May 11, 2022
cmacknz
approved these changes
May 11, 2022
belimawr
force-pushed
the
fix-python-tests-for-python-3.9
branch
3 times, most recently
from
2b81140
to
ff8f60f
Compare
belimawr
changed the title
belimawr
force-pushed
the
fix-python-tests-for-python-3.9
branch
from
ff8f60f
to
ba3a8c2
Compare
belimawr
commented
May 12, 2022
|
|
||
| self.wait_until(lambda: self.log_contains( | ||
| "Start accepting connections")) | ||
|
|
||
| sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) | ||
|
|
||
| context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) | ||
| context = ssl.create_default_context(purpose=ssl.Purpose.SERVER_AUTH) |
There was a problem hiding this comment.
If I keep the ssl.Purpose.CLIENT_AUTH the test fails with ssl.SSLError: Cannot create a client socket with a PROTOCOL_TLS_SERVER context (_ssl.c:801)
|
@cmacknz could you review it again? I refactored it to cover more cases and improved the documentation. |
belimawr
force-pushed
the
fix-python-tests-for-python-3.9
branch
from
ba3a8c2
to
0147c47
Compare
5 tasks
AndersonQ
reviewed
May 12, 2022
This commit improves the compatibility and stability of Python tests for Filebeat. It addresses two main probmes: 1. Some deprecated TLS functions are now raising deprecation exceptions (since Python 3.10.0) 2. Some tests, on failure, leave Filebeat running and bound to port 8080, this creates a cascading failure of the subsequent tests that require the same port to be available. The main changes are: - Ensuring Filebeat process is always terminated, even if the test fails - Using the replacement methods/objects for the deprecated TLS functions.
belimawr
force-pushed
the
fix-python-tests-for-python-3.9
branch
from
0147c47
to
4989ce0
Compare
cmacknz
approved these changes
May 12, 2022
chrisberkhout
pushed a commit
that referenced
this pull request
Jun 1, 2023
This commit improves the compatibility and stability of Python tests for Filebeat. It addresses two main probmes: 1. Some deprecated TLS functions are now raising deprecation exceptions (since Python 3.10.0) 2. Some tests, on failure, leave Filebeat running and bound to port 8080, this creates a cascading failure of the subsequent tests that require the same port to be available. The main changes are: - Ensuring Filebeat process is always terminated, even if the test fails - Using the replacement methods/objects for the deprecated TLS functions.
mergify bot
pushed a commit
that referenced
this pull request
Jun 21, 2023
This commit improves the compatibility and stability of Python tests for Filebeat. It addresses two main probmes: 1. Some deprecated TLS functions are now raising deprecation exceptions (since Python 3.10.0) 2. Some tests, on failure, leave Filebeat running and bound to port 8080, this creates a cascading failure of the subsequent tests that require the same port to be available. The main changes are: - Ensuring Filebeat process is always terminated, even if the test fails - Using the replacement methods/objects for the deprecated TLS functions. (cherry picked from commit 682045a) # Conflicts: # libbeat/tests/system/beat/beat.py
cmacknz
added a commit
that referenced
this pull request
Jun 21, 2023
…olang Debian base image (#35840) * ci: use ubuntu:22 workers (#34315) (cherry picked from commit a5f15b6) # Conflicts: # .ci/beats-tester.groovy # .ci/build-docker-images.groovy # .ci/heartbeat-synthetics.groovy # x-pack/filebeat/Jenkinsfile.yml # x-pack/metricbeat/Jenkinsfile.yml * remove unexisting files in 7.17 when backporting another PR * fix merge conflicts * Upgrade to Go 1.19.10 and handle changes in golang Debian base image (#35780) * Explicitly install netcat-openbsd everywhere. The plain netcat package appears to have been removed in the latest golang:1.19.10 base image. * Setup a virtualenv in Docker containers. This fixes the PEP668 error about "externally managed environments" which prevents modifying the system python installation. * Revert "Revert "[Automation] Bump Golang version to 1.19.10 (#35751)" (#35784)" This reverts commit 27b1799. * Reword CHANGELOG.next.asciidoc Co-authored-by: subham sarkar <sarkar.subhams2@gmail.com> * Improve PEP668 comments. * Install latest PyYAML in test containers. * Add check to see if already in a venv. * Upgrade pytest and py. Remove dependency on pytest-otel as it prevented upgrading pytest. * Check for pre-set virtualenv earlier. * Always create a fresh virtualenv in Docker. Remove duplicate dependencies from the docker files. * Fix metricbeat integration tests. * Force install Python dependencies for Metricbeat. --------- Co-authored-by: subham sarkar <sarkar.subhams2@gmail.com> (cherry picked from commit 62374dd) # Conflicts: # dev-tools/mage/pytest.go # libbeat/docs/version.asciidoc # libbeat/tests/system/requirements.txt # libbeat/tests/system/requirements_aix.txt # metricbeat/Dockerfile * Remove extra entry in CHANGELOG.next.asciidoc * Fix conflict in version.asciidoc * Fix conflict in requirements.txt * Fix conflict in requirements_aix.txt * Fix conflict in metricbeat Dockerfile * Fix conflict in pytest.go * Add missing force create virtual env option. * python tests: compatibility and stability improvements (#31588) This commit improves the compatibility and stability of Python tests for Filebeat. It addresses two main probmes: 1. Some deprecated TLS functions are now raising deprecation exceptions (since Python 3.10.0) 2. Some tests, on failure, leave Filebeat running and bound to port 8080, this creates a cascading failure of the subsequent tests that require the same port to be available. The main changes are: - Ensuring Filebeat process is always terminated, even if the test fails - Using the replacement methods/objects for the deprecated TLS functions. (cherry picked from commit 682045a) # Conflicts: # libbeat/tests/system/beat/beat.py * Remove duplicate entries in CHANGELOG-developer.next.asciidoc * Resolve conflicts in beat.py --------- Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co> Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR improves the compatibility and stability of Python tests
for Filebeat. It addresses two main probmes:
exceptions (since Python 3.10.0)
8080, this creates a cascading failure of the subsequent tests that
require the same port to be available.
The main changes are:
fails
functions.
Why is it important?
It make the tests less flaky and enables support for newer versions of Python by removing the use of deprecated functions from Python 2.7.x
Checklist
[ ] I have commented my code, particularly in hard-to-understand areas[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files[ ] I have added tests that prove my fix is effective or that my feature worksCHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.## Author's ChecklistHow to test this PR locally
On a environment with Python >= 3.9.x (like Arch Linux), run the Python tests from Filebeat:
They should run without any issue.
Run tests from
filebeat/tests/system/test_syslog.pyorfilebeat/tests/system/test_tcp_tls.pyand force a failure or interrupt them, after they finish there should be not dangling Filebeat process.## Related issues## Use cases## Screenshots## Logs