Fix session tracking tests #1222
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
insom
force-pushed
the
fix-tracking-tests
branch
from
04e8f36 to
366bd0d
Compare
|
cc @byroot |
Yeah I already dealt with them in other PRs. Thank you for the fix! |
sodabrew
reviewed
Nov 30, 2021
There was a problem hiding this comment.
I had a few review nits for this one, nothing major. cc @tenderlove
| @@ -1078,19 +1078,24 @@ def run_gc | |||
| end | |||
|
|
|||
| it "returns multiple session track type values when available" do | |||
| @client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS'") | |||
| @client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS';") | |||
There was a problem hiding this comment.
Suggested change
| @client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS';") | |
| @client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS'") |
This semicolon shouldn't be needed.
| res = @client.session_track(Mysql2::Client::SESSION_TRACK_STATE_CHANGE) | ||
| expect(res).to be_nil | ||
| it "returns valid transaction state inside a transaction" do | ||
| @client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS';") |
There was a problem hiding this comment.
Suggested change
| @client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS';") | |
| @client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS'") |
Same again for the semicolon.
| expect(res).to be_nil | ||
| it "returns valid transaction state inside a transaction" do | ||
| @client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS';") | ||
| @client.query("START TRANSACTION;") |
There was a problem hiding this comment.
Suggested change
| @client.query("START TRANSACTION;") | |
| @client.query("START TRANSACTION") |
|
@sodabrew sorry about merging before you could comment! I'll make the changes you suggest and put them in a new PR |
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.
closes #1220
I didn't write the original tests, but looking at them I think that they relied on undefined behaviour.
I've broken the check for transaction state tracking into its own test, and followed the tests that MySQL itself performs in its test suite:
https://github.com/mysql/mysql-server/blob/3290a66c89eb1625a7058e0ef732432b6952b435/mysql-test/r/session_tracker_trx_state.result#L154L159
The original test (which checks that multiple client state updates can be read) is still valid.
Arguably this new test isn't testing my original library changes anyway, it's testing MySQL client behaviour, but I don't want to just remove a failing test to make things pass 😬
There are unrelated failures to #1220 which I haven't addressed.