From c60609708e0f4984ff65b7e9bd7653a48f8c18d4 Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 11 May 2022 14:14:20 +0800 Subject: [PATCH] session: migrate test-infra to testify for parts of session_test Signed-off-by: tison --- {session => server}/tidb_library_test.go | 2 +- session/backup_restore_test.go | 2 +- session/isolation_test.go | 20 +- session/nontransactional_test.go | 32 +- session/session_fail_test.go | 12 +- session/session_legacy_test.go | 500 +-------------------- session/session_test.go | 545 +++++++++++++++++++++++ session/statistics_test.go | 2 +- session/txn_state_test.go | 18 +- 9 files changed, 591 insertions(+), 542 deletions(-) rename {session => server}/tidb_library_test.go (98%) create mode 100644 session/session_test.go diff --git a/session/tidb_library_test.go b/server/tidb_library_test.go similarity index 98% rename from session/tidb_library_test.go rename to server/tidb_library_test.go index c025fd6339c51..8d895aa692e95 100644 --- a/session/tidb_library_test.go +++ b/server/tidb_library_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package session_test +package server_test import ( "runtime" diff --git a/session/backup_restore_test.go b/session/backup_restore_test.go index 305588a05255f..b8f8d8f34e0cc 100644 --- a/session/backup_restore_test.go +++ b/session/backup_restore_test.go @@ -33,7 +33,7 @@ func TestBackupAndRestore(t *testing.T) { t.Skip("only run BR SQL integration test with tikv store") } - store, clean := createStorage(t) + store, clean := createMockStoreAndSetup(t) defer clean() cfg := config.GetGlobalConfig() diff --git a/session/isolation_test.go b/session/isolation_test.go index eafeee4ca0f97..9e211b103de2d 100644 --- a/session/isolation_test.go +++ b/session/isolation_test.go @@ -27,7 +27,7 @@ These test cases come from the paper . The sign 'P0', 'P1'.... can be found in the paper. These cases will run under snapshot isolation. */ func TestP0DirtyWrite(t *testing.T) { - store, clean := createStorage(t) + store, clean := createMockStoreAndSetup(t) defer clean() session1 := testkit.NewTestKit(t, store) session2 := testkit.NewTestKit(t, store) @@ -86,7 +86,7 @@ func TestP0DirtyWrite(t *testing.T) { } func TestP1DirtyRead(t *testing.T) { - store, clean := createStorage(t) + store, clean := createMockStoreAndSetup(t) defer clean() session1 := testkit.NewTestKit(t, store) session2 := testkit.NewTestKit(t, store) @@ -136,7 +136,7 @@ func TestP1DirtyRead(t *testing.T) { } func TestP2NonRepeatableRead(t *testing.T) { - store, clean := createStorage(t) + store, clean := createMockStoreAndSetup(t) defer clean() session1 := testkit.NewTestKit(t, store) session2 := testkit.NewTestKit(t, store) @@ -207,7 +207,7 @@ func TestP2NonRepeatableRead(t *testing.T) { } func TestP3Phantom(t *testing.T) { - store, clean := createStorage(t) + store, clean := createMockStoreAndSetup(t) defer clean() session1 := testkit.NewTestKit(t, store) session2 := testkit.NewTestKit(t, store) @@ -275,7 +275,7 @@ func TestP3Phantom(t *testing.T) { } func TestP4LostUpdate(t *testing.T) { - store, clean := createStorage(t) + store, clean := createMockStoreAndSetup(t) defer clean() session1 := testkit.NewTestKit(t, store) session2 := testkit.NewTestKit(t, store) @@ -336,7 +336,7 @@ func TestP4LostUpdate(t *testing.T) { func TestP4CLostUpdate(t *testing.T) {} func TestA3Phantom(t *testing.T) { - store, clean := createStorage(t) + store, clean := createMockStoreAndSetup(t) defer clean() session1 := testkit.NewTestKit(t, store) session2 := testkit.NewTestKit(t, store) @@ -389,7 +389,7 @@ func TestA3Phantom(t *testing.T) { } func TestA5AReadSkew(t *testing.T) { - store, clean := createStorage(t) + store, clean := createMockStoreAndSetup(t) defer clean() session1 := testkit.NewTestKit(t, store) session2 := testkit.NewTestKit(t, store) @@ -454,7 +454,7 @@ func TestA5AReadSkew(t *testing.T) { } func TestA5BWriteSkew(t *testing.T) { - store, clean := createStorage(t) + store, clean := createMockStoreAndSetup(t) defer clean() session1 := testkit.NewTestKit(t, store) session2 := testkit.NewTestKit(t, store) @@ -551,7 +551,7 @@ These test cases come from the paper