chore(mariadb): update tests to support mariadb>=1.1.0 (backport #3883) #3901
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
The latest version of mariadb client library requires a newer version of the C library in order to build. This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans. This PR depends on #3884 to be merged and update our dev image first before this can pass. This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it. Co-authored-by: Kyle Verhoog <[email protected]> Co-authored-by: Munir Abdinur <[email protected]> (cherry picked from commit 22746a3) # Conflicts: # tests/contrib/mariadb/test_mariadb.py
14 tasks
P403n1x87
previously approved these changes
Jul 4, 2022
Kyle-Verhoog
force-pushed
the
mergify/bp/0.x/pr-3883
branch
from
f33dd00 to
16ab6f3
Compare
brettlangdon
added
changelog/no-changelog
|
@mergify[bot] this pull request is now in conflict 😩 |
|
@Mergifyio backport 0.61 |
mergify bot
added a commit
that referenced
this pull request
Oct 27, 2022
… (#3901) * chore(mariadb): update tests to support mariadb>=1.1.0 (#3883) The latest version of mariadb client library requires a newer version of the C library in order to build. This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans. This PR depends on #3884 to be merged and update our dev image first before this can pass. This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it. Co-authored-by: Kyle Verhoog <[email protected]> Co-authored-by: Munir Abdinur <[email protected]> (cherry picked from commit 22746a3) (cherry picked from commit 3db913e) # Conflicts: # tests/contrib/mariadb/test_mariadb.py
✅ Backports have been created
|
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.
This is an automatic backport of pull request #3883 done by Mergify.
Cherry-pick of 22746a3 has failed:
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com