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

executor: migrate test-infra to testify for executor_test.go testSlowQuerySuite #33561

Merged
merged 4 commits into from
Apr 1, 2022

Conversation

tisonkun
Copy link
Contributor

Issue Number: close #33439

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 29, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • xhebox

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 29, 2022
@tisonkun
Copy link
Contributor Author

/cc @hawkingrei @djshow832

@hawkingrei
Copy link
Member

/run-check_dev
/run-unit-test

@crazycs520
Copy link
Contributor

@tisonkun You can fix the test by add following change

diff --git a/executor/slow_query_sql_test.go b/executor/slow_query_sql_test.go
index 63aaeaeadb..fc4593bbb2 100644
--- a/executor/slow_query_sql_test.go
+++ b/executor/slow_query_sql_test.go
@@ -15,6 +15,7 @@
 package executor_test

 import (
+       "fmt"
        "math"
        "os"
        "testing"
@@ -61,6 +62,7 @@ func TestSlowQuerySensitiveQuery(t *testing.T) {
        }()
        require.NoError(t, logutil.InitLogger(newCfg.Log.ToLogConfig()))

+       tk.MustExec(fmt.Sprintf("set @@tidb_slow_query_file='%v'", f.Name()))
        tk.MustExec("set tidb_slow_log_threshold=0;")
        tk.MustExec("drop user if exists user_sensitive;")
        tk.MustExec("create user user_sensitive identified by '123456789';")
@@ -96,6 +98,7 @@ func TestSlowQueryPrepared(t *testing.T) {
        }()
        require.NoError(t, logutil.InitLogger(newCfg.Log.ToLogConfig()))

+       tk.MustExec(fmt.Sprintf("set @@tidb_slow_query_file='%v'", f.Name()))
        tk.MustExec("set tidb_slow_log_threshold=0;")
        tk.MustExec(`prepare mystmt1 from 'select sleep(?), 1';`)
        tk.MustExec("SET @num = 0.01;")
@@ -126,6 +129,7 @@ func TestLogSlowLogIndex(t *testing.T) {
        })
        require.NoError(t, logutil.InitLogger(config.GetGlobalConfig().Log.ToLogConfig()))

+       tk.MustExec(fmt.Sprintf("set @@tidb_slow_query_file='%v'", f.Name()))
        tk.MustExec("use test")
        tk.MustExec("create table t (a int, b int,index idx(a));")
        tk.MustExec("set tidb_slow_log_threshold=0;")
@@ -163,6 +167,7 @@ select * from t;
        }()
        require.NoError(t, logutil.InitLogger(newCfg.Log.ToLogConfig()))

+       tk.MustExec(fmt.Sprintf("set @@tidb_slow_query_file='%v'", f.Name()))
        tk.MustQuery("select count(*) from `information_schema`.`slow_query` where time > '2020-10-16 20:08:13' and time < '2020-10-16 21:08:13'").Check(testkit.Rows("1"))
        tk.MustQuery("select count(*) from `information_schema`.`slow_query` where time > '2019-10-13 20:08:13' and time < '2020-10-16 21:08:13'").Check(testkit.Rows("2"))
 }

@tisonkun
Copy link
Contributor Author

Thank @crazycs520 and updated.

@sre-bot
Copy link
Contributor

sre-bot commented Mar 31, 2022

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 31, 2022
@tisonkun
Copy link
Contributor Author

/cc @crazycs520 @xhebox

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 1, 2022
@tisonkun
Copy link
Contributor Author

tisonkun commented Apr 1, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 2026878

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 1, 2022
@ti-chi-bot
Copy link
Member

@tisonkun: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit 94c57b3 into pingcap:master Apr 1, 2022
@tisonkun tisonkun deleted the issue-33439 branch April 13, 2022 01:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

migrate test-infra to testify for executor_test.go testSlowQuery
7 participants