Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
lcwangchao committed Jun 17, 2024
1 parent 2ec6df0 commit 3b03c7a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
4 changes: 0 additions & 4 deletions pkg/server/tests/servertestkit/testkit.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ func CreateTidbTestSuiteWithCfg(t *testing.T, cfg *config.Config) *TidbTestSuite
ts.Domain, err = session.BootstrapSession(ts.Store)
require.NoError(t, err)
ts.Tidbdrv = srv.NewTiDBDriver(ts.Store)
<<<<<<< HEAD
=======

>>>>>>> 72d22d60fca (privilege: fix `auth_socket` bug, should only allow os user name to login (#54032))
srv.RunInGoTestChan = make(chan struct{})
server, err := srv.NewServer(cfg, ts.Tidbdrv)
require.NoError(t, err)
Expand Down
12 changes: 0 additions & 12 deletions pkg/server/tests/tidb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ import (
"net/http"
"os"
"path/filepath"
<<<<<<< HEAD:pkg/server/tests/tidb_test.go
=======
"runtime"
>>>>>>> 72d22d60fca (privilege: fix `auth_socket` bug, should only allow os user name to login (#54032)):pkg/server/tests/commontest/tidb_test.go
"strings"
"sync"
"sync/atomic"
Expand Down Expand Up @@ -3148,13 +3144,6 @@ func TestConnectionCount(t *testing.T) {
ts := servertestkit.CreateTidbTestSuite(t)
ts.RunTestConnectionCount(t)
}
<<<<<<< HEAD:pkg/server/tests/tidb_test.go
=======

func TestTypeAndCharsetOfSendLongData(t *testing.T) {
ts := servertestkit.CreateTidbTestSuite(t)
ts.RunTestTypeAndCharsetOfSendLongData(t)
}

func TestAuthSocket(t *testing.T) {
defer server2.ClearOSUserForAuthSocket()
Expand Down Expand Up @@ -3224,4 +3213,3 @@ func TestAuthSocket(t *testing.T) {
ts.CheckRows(t, rows, "u2@%")
})
}
>>>>>>> 72d22d60fca (privilege: fix `auth_socket` bug, should only allow os user name to login (#54032)):pkg/server/tests/commontest/tidb_test.go

0 comments on commit 3b03c7a

Please sign in to comment.