resolve conflicts

pingcap · Dec 20, 2021 · b3666b7 · b3666b7
1 parent 60db6c5
commit b3666b7
Showing 1 changed file with 0 additions and 25 deletions.
diff --git a/dumpling/export/sql_test.go b/dumpling/export/sql_test.go
@@ -1736,8 +1736,6 @@ func TestPickupPossibleField(t *testing.T) {
 	}
 }
 
-<<<<<<< HEAD
-=======
 func TestCheckIfSeqExists(t *testing.T) {
 	t.Parallel()
 
@@ -1767,29 +1765,6 @@ func TestCheckIfSeqExists(t *testing.T) {
 	require.Equal(t, false, exists)
 }
 
-func TestGetCharsetAndDefaultCollation(t *testing.T) {
-	t.Parallel()
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, db.Close())
-	}()
-	ctx := context.Background()
-	conn, err := db.Conn(ctx)
-	require.NoError(t, err)
-
-	mock.ExpectQuery("SHOW CHARACTER SET").
-		WillReturnRows(sqlmock.NewRows([]string{"Charset", "Description", "Default collation", "Maxlen"}).
-			AddRow("utf8mb4", "UTF-8 Unicode", "utf8mb4_0900_ai_ci", 4).
-			AddRow("latin1", "cp1252 West European", "latin1_swedish_ci", 1))
-
-	charsetAndDefaultCollation, err := GetCharsetAndDefaultCollation(ctx, conn)
-	require.NoError(t, err)
-	require.Equal(t, "utf8mb4_0900_ai_ci", charsetAndDefaultCollation["utf8mb4"])
-	require.Equal(t, "latin1_swedish_ci", charsetAndDefaultCollation["latin1"])
-}
-
->>>>>>> 9d307b00a... dumpling: fix dump failed when sequence exists (#30164)
 func makeVersion(major, minor, patch int64, preRelease string) *semver.Version {
 	return &semver.Version{
 		Major:      major,