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

[7.17](backport #31588) python tests: compatibility and stability improvements #35844

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 21, 2023

This is an automatic backport of pull request #31588 done by Mergify.
Cherry-pick of 682045a has failed:

On branch mergify/bp/7.17/pr-31588
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 682045a981.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG-developer.next.asciidoc
	modified:   filebeat/tests/system/test_syslog.py
	modified:   filebeat/tests/system/test_tcp_tls.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/tests/system/beat/beat.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

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
@mergify mergify bot requested a review from a team as a code owner June 21, 2023 01:59
@mergify mergify bot requested review from belimawr and faec and removed request for a team June 21, 2023 01:59
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 21, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 21, 2023
@botelastic
Copy link

botelastic bot commented Jun 21, 2023

This pull request doesn't have a Team:<team> label.

@cmacknz
Copy link
Member

cmacknz commented Jun 21, 2023

Closing, merged into #35840

@cmacknz cmacknz closed this Jun 21, 2023
@cmacknz cmacknz deleted the mergify/bp/7.17/pr-31588 branch June 21, 2023 02:06
@elasticmachine
Copy link
Collaborator

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@elasticmachine
Copy link
Collaborator

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-06-21T01:59:18.179+0000

  • Duration: 8 min 8 sec

Steps errors 1

Expand to view the steps failures

Shell Script
  • Took 0 min 0 sec . View more details here
  • Description: git diff --name-only origin/7.17...73f85c689c7c7a120f958ab9987d515cdddb7ff6 > git-diff.txt

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@elasticmachine
Copy link
Collaborator

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-06-21T02:01:34.859+0000

  • Duration: 6 min 23 sec

Steps errors 1

Expand to view the steps failures

Shell Script
  • Took 0 min 0 sec . View more details here
  • Description: git diff --name-only origin/7.17...73f85c689c7c7a120f958ab9987d515cdddb7ff6 > git-diff.txt

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants