From 8dab834a3bb2f920bb2a4b52eff736cb8462a1cb Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 3 Mar 2020 15:30:31 +0800
Subject: [PATCH] fix some tests and ignore some

---
 Makefile               | 4 ++--
 session_get_test.go    | 4 ++--
 session_update_test.go | 5 +++++
 xorm_test.go           | 6 +++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index e3bccd57..faad978f 100644
--- a/Makefile
+++ b/Makefile
@@ -125,13 +125,13 @@ test: test-sqlite
 test-cockroach: go-check
 	$(GO) test -race -db=postgres -schema='$(TEST_COCKROACH_SCHEMA)' -cache=$(TEST_CACHE_ENABLE) \
 	-conn_str="postgres://$(TEST_COCKROACH_USERNAME):$(TEST_COCKROACH_PASSWORD)@$(TEST_COCKROACH_HOST)/$(TEST_COCKROACH_DBNAME)?sslmode=disable&experimental_serial_normalization=sql_sequence" \
-	-coverprofile=cockroach.$(TEST_COCKROACH_SCHEMA).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic
+	-ignore_update_limit=true -coverprofile=cockroach.$(TEST_COCKROACH_SCHEMA).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic
 
 .PHONY: test-cockroach\#%
 test-cockroach\#%: go-check
 	$(GO) test -race -run $* -db=postgres -schema='$(TEST_COCKROACH_SCHEMA)' -cache=$(TEST_CACHE_ENABLE) \
 	-conn_str="postgres://$(TEST_COCKROACH_USERNAME):$(TEST_COCKROACH_PASSWORD)@$(TEST_COCKROACH_HOST)/$(TEST_COCKROACH_DBNAME)?sslmode=disable&experimental_serial_normalization=sql_sequence" \
-	-coverprofile=cockroach.$(TEST_COCKROACH_SCHEMA).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic
+	-ignore_update_limit=true -coverprofile=cockroach.$(TEST_COCKROACH_SCHEMA).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic
 
 .PNONY: test-mssql
 test-mssql: go-check
diff --git a/session_get_test.go b/session_get_test.go
index b7eac2b4..5bac9cd7 100644
--- a/session_get_test.go
+++ b/session_get_test.go
@@ -335,13 +335,13 @@ func TestJSONString(t *testing.T) {
 	assert.NoError(t, err)
 	assert.True(t, has)
 	assert.EqualValues(t, 1, js.Id)
-	assert.EqualValues(t, `["1","2"]`, js.Content)
+	assert.True(t, `["1","2"]` == js.Content || `["1", "2"]` == js.Content)
 
 	var jss []JsonString
 	err = testEngine.Table("json_json").Find(&jss)
 	assert.NoError(t, err)
 	assert.EqualValues(t, 1, len(jss))
-	assert.EqualValues(t, `["1","2"]`, jss[0].Content)
+	assert.True(t, `["1","2"]` == jss[0].Content || `["1", "2"]` == jss[0].Content)
 }
 
 func TestGetActionMapping(t *testing.T) {
diff --git a/session_update_test.go b/session_update_test.go
index 0ef59155..f76e447b 100644
--- a/session_update_test.go
+++ b/session_update_test.go
@@ -42,6 +42,11 @@ func TestUpdateMap(t *testing.T) {
 }
 
 func TestUpdateLimit(t *testing.T) {
+	if *ingoreUpdateLimit {
+		t.Skip()
+		return
+	}
+
 	assert.NoError(t, prepareEngine())
 
 	type UpdateTable2 struct {
diff --git a/xorm_test.go b/xorm_test.go
index 75000417..c1f38757 100644
--- a/xorm_test.go
+++ b/xorm_test.go
@@ -37,9 +37,9 @@ var (
 	splitter           = flag.String("splitter", ";", "the splitter on connstr for cluster")
 	schema             = flag.String("schema", "", "specify the schema")
 	ignoreSelectUpdate = flag.Bool("ignore_select_update", false, "ignore select update if implementation difference, only for tidb")
-
-	tableMapper names.Mapper
-	colMapper   names.Mapper
+	ingoreUpdateLimit  = flag.Bool("ignore_update_limit", false, "ignore update limit if implementation difference, only for cockroach")
+	tableMapper        names.Mapper
+	colMapper          names.Mapper
 )
 
 func createEngine(dbType, connStr string) error {