Skip to content

test: add marker for running tests in subprocess (backport #3383) #4403

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

Merged
merged 5 commits into from
Oct 31, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 27, 2022

This is an automatic backport of pull request #3383 done by Mergify.
Cherry-pick of c437ad2 has failed:

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

You are currently cherry-picking commit c437ad25.
  (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:   conftest.py
	modified:   tests/conftest.py
	modified:   tests/contrib/gevent/test_monkeypatch.py
	modified:   tests/contrib/mariadb/test_mariadb.py
	modified:   tests/contrib/snowflake/test_snowflake.py
	modified:   tests/integration/test_debug.py
	modified:   tests/runtime/test_runtime_metrics_api.py
	modified:   tests/tracer/telemetry/test_data.py
	modified:   tests/tracer/test_atexit.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/contrib/httpx/test_httpx.py
	both modified:   tests/integration/test_integration.py
	both modified:   tests/tracer/test_encoders.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

The `subprocess` pytest marker can be used to run arbitrary Python code in a Python
subprocess. This is meant to replace the existing fixture to allow actual
Python code to be written and tested, instead of using literal strings.

## Checklist
- [ ] Added to the correct milestone.
- [ ] Tests provided or description of manual testing performed is included in the code or PR.
- [ ] Library documentation is updated.
- [ ] [Corp site](https://github.com/DataDog/documentation/) documentation is updated (link to the PR).

(cherry picked from commit c437ad2)

# Conflicts:
#	tests/contrib/httpx/test_httpx.py
#	tests/integration/test_integration.py
#	tests/tracer/test_encoders.py
@mergify mergify bot requested a review from a team as a code owner October 27, 2022 18:15
@mergify mergify bot added the conflicts label Oct 27, 2022
@mergify mergify bot removed the conflicts label Oct 27, 2022
@mabdinur mabdinur force-pushed the mergify/bp/0.61/pr-3383 branch 2 times, most recently from b8d98ef to 5423fdc Compare October 27, 2022 21:00
@mabdinur mabdinur added changelog/no-changelog A changelog entry is not required for this PR. manual merge Do not automatically merge labels Oct 27, 2022
@mabdinur mabdinur force-pushed the mergify/bp/0.61/pr-3383 branch from 5423fdc to a337e1b Compare October 27, 2022 21:19
@mergify
Copy link
Contributor Author

mergify bot commented Oct 27, 2022

@mergify[bot] this pull request is now in conflict 😩

@mergify mergify bot added the conflicts label Oct 27, 2022
@mergify mergify bot removed the conflicts label Oct 28, 2022
P403n1x87
P403n1x87 previously approved these changes Oct 28, 2022
mabdinur
mabdinur previously approved these changes Oct 28, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Oct 28, 2022

@mergify[bot] this pull request is now in conflict 😩

@mergify mergify bot added the conflicts label Oct 28, 2022
@mergify mergify bot removed the conflicts label Oct 28, 2022
@Kyle-Verhoog Kyle-Verhoog merged commit 814f793 into 0.61 Oct 31, 2022
@Kyle-Verhoog Kyle-Verhoog deleted the mergify/bp/0.61/pr-3383 branch October 31, 2022 18:19
@mabdinur mabdinur removed the manual merge Do not automatically merge label Oct 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog A changelog entry is not required for this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants