From 55429ad58956bcad5b133e1fcd6bd48afc7d9fe0 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 28 Nov 2020 00:11:22 +0800 Subject: [PATCH] fix data race issue in unit testing case of package gdb --- database/gdb/gdb_z_mysql_model_test.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/database/gdb/gdb_z_mysql_model_test.go b/database/gdb/gdb_z_mysql_model_test.go index 89a2429f8..c6e87fe74 100644 --- a/database/gdb/gdb_z_mysql_model_test.go +++ b/database/gdb/gdb_z_mysql_model_test.go @@ -2946,14 +2946,8 @@ func Test_TimeZoneInsert(t *testing.T) { tableName := createTableForTimeZoneTest() defer dropTable(tableName) - timeLocal := time.Local - gtest.C(t, func(t *gtest.T) { - err := gtime.SetTimeZone("Asia/Shanghai") - t.Assert(err, nil) - }) - defer func() { - time.Local = timeLocal - }() + asiaLocal, err := time.LoadLocation("Asia/Shanghai") + gtest.Assert(err, nil) CreateTime := "2020-11-22 12:23:45" UpdateTime := "2020-11-22 13:23:45" @@ -2964,11 +2958,14 @@ func Test_TimeZoneInsert(t *testing.T) { UpdatedAt gtime.Time `json:"updated_at"` DeletedAt time.Time `json:"deleted_at"` } + t1, _ := time.ParseInLocation("2006-01-02 15:04:05", CreateTime, asiaLocal) + t2, _ := time.ParseInLocation("2006-01-02 15:04:05", UpdateTime, asiaLocal) + t3, _ := time.ParseInLocation("2006-01-02 15:04:05", DeleteTime, asiaLocal) u := &User{ Id: 1, - CreatedAt: gtime.NewFromStr(CreateTime).UTC(), - UpdatedAt: *gtime.NewFromStr(UpdateTime).UTC(), - DeletedAt: gtime.NewFromStr(DeleteTime).Time.UTC(), + CreatedAt: gtime.New(t1.UTC()), + UpdatedAt: *gtime.New(t2.UTC()), + DeletedAt: t3.UTC(), } gtest.C(t, func(t *gtest.T) {