Skip to content

Commit 4c034f1

Browse files
authored
Merge pull request #1222 from Shopify/fix-tracking-tests
Fix session tracking tests
2 parents 6652da2 + 366bd0d commit 4c034f1

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

spec/mysql2/client_spec.rb

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,19 +1078,24 @@ def run_gc
10781078
end
10791079

10801080
it "returns multiple session track type values when available" do
1081-
@client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS'")
1081+
@client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS';")
10821082

1083-
res = @client.session_track(Mysql2::Client::SESSION_TRACK_TRANSACTION_STATE)
1084-
expect(res).to eq(["________"])
1083+
res = @client.session_track(Mysql2::Client::SESSION_TRACK_SYSTEM_VARIABLES)
1084+
expect(res).to eq(%w[session_track_transaction_info CHARACTERISTICS])
1085+
1086+
res = @client.session_track(Mysql2::Client::SESSION_TRACK_STATE_CHANGE)
1087+
expect(res).to be_nil
10851088

10861089
res = @client.session_track(Mysql2::Client::SESSION_TRACK_TRANSACTION_CHARACTERISTICS)
10871090
expect(res).to eq([""])
1091+
end
10881092

1089-
res = @client.session_track(Mysql2::Client::SESSION_TRACK_STATE_CHANGE)
1090-
expect(res).to be_nil
1093+
it "returns valid transaction state inside a transaction" do
1094+
@client.query("SET @@SESSION.session_track_transaction_info='CHARACTERISTICS';")
1095+
@client.query("START TRANSACTION;")
10911096

1092-
res = @client.session_track(Mysql2::Client::SESSION_TRACK_SYSTEM_VARIABLES)
1093-
expect(res).to eq(%w[session_track_transaction_info CHARACTERISTICS])
1097+
res = @client.session_track(Mysql2::Client::SESSION_TRACK_TRANSACTION_STATE)
1098+
expect(res).to eq(["T_______"])
10941099
end
10951100

10961101
it "returns empty array if session track type not found" do

0 commit comments

Comments
 (0)