diff --git a/orm/orm_test.go b/orm/orm_test.go index aac9fef8..d2d10a6d 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -2175,10 +2175,12 @@ func TestIgnoreCaseTag(t *testing.T) { throwFail(t, AssertIs(info.fields.GetByName("Name03").column, "name")) } func TestInsertOrUpdate(t *testing.T) { + RegisterModel(new(User)) user := User{UserName: "unique_username133", Status: 1, Password: "o"} user1 := User{UserName: "unique_username133", Status: 2, Password: "o"} user2 := User{UserName: "unique_username133", Status: 3, Password: "oo"} dORM.Insert(&user) + test := User{UserName: "unique_username133"} fmt.Println(dORM.Driver().Name()) if dORM.Driver().Name() == "sqlite3" { fmt.Println("sqlite3 is nonsupport") @@ -2190,18 +2192,15 @@ func TestInsertOrUpdate(t *testing.T) { fmt.Println(err) } else { throwFailNow(t, err) + dORM.Read(&test, "UserName") + throwFailNow(t, AssertIs(user1.Status, test.Status)) } - test := User{UserName: "unique_username133"} - time.Sleep(time.Second * 1) - dORM.Read(&test, "UserName") - throwFailNow(t, AssertIs(user1.Status, test.Status)) //test2 普通操作 _, err = dORM.InsertOrUpdate(&user2, "UserName") if err != nil && (err.Error() == "postgres version must 9.5 or higher" || err.Error() == "`sqlite3` nonsupport insert or update in beego") { fmt.Println(err) } else { throwFailNow(t, err) - time.Sleep(time.Second * 1) dORM.Read(&test, "UserName") throwFailNow(t, AssertIs(user2.Status, test.Status)) throwFailNow(t, AssertIs(user2.Password, strings.TrimSpace(test.Password))) @@ -2212,7 +2211,6 @@ func TestInsertOrUpdate(t *testing.T) { fmt.Println(err) } else { throwFailNow(t, err) - time.Sleep(time.Second * 1) dORM.Read(&test, "UserName") throwFailNow(t, AssertIs(user2.Status+1, test.Status)) } @@ -2222,7 +2220,6 @@ func TestInsertOrUpdate(t *testing.T) { fmt.Println(err) } else { throwFailNow(t, err) - time.Sleep(time.Second * 1) dORM.Read(&test, "UserName") throwFailNow(t, AssertIs((user2.Status+1)-1, test.Status)) } @@ -2232,7 +2229,6 @@ func TestInsertOrUpdate(t *testing.T) { fmt.Println(err) } else { throwFailNow(t, err) - time.Sleep(time.Second * 1) dORM.Read(&test, "UserName") throwFailNow(t, AssertIs(((user2.Status+1)-1)*3, test.Status)) } @@ -2242,7 +2238,6 @@ func TestInsertOrUpdate(t *testing.T) { fmt.Println(err) } else { throwFailNow(t, err) - time.Sleep(time.Second * 1) dORM.Read(&test, "UserName") throwFailNow(t, AssertIs((((user2.Status+1)-1)*3)/3, test.Status)) }