From ae70cfeeedde7d5e69c781911c3a9f086de39358 Mon Sep 17 00:00:00 2001
From: XuPeng-SH <xupeng3112@163.com>
Date: Thu, 9 Jun 2022 15:57:56 +0800
Subject: [PATCH] (tae): update ut for sleep time (#2878)
---
pkg/vm/engine/aoe/storage/db/db.go | 2 ++
pkg/vm/engine/tae/db/scheduler_test.go | 14 +++++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pkg/vm/engine/aoe/storage/db/db.go b/pkg/vm/engine/aoe/storage/db/db.go
index f6231e1c5..35b4b3d1e 100644
--- a/pkg/vm/engine/aoe/storage/db/db.go
+++ b/pkg/vm/engine/aoe/storage/db/db.go
@@ -254,6 +254,8 @@ func (d *DB) ApplySnapshot(dbName string, path string) error {
var err error
database, _ := d.Store.Catalog.SimpleGetDatabaseByName(dbName)
loader := NewDBSSLoader(d.Store.Catalog, database, d.Store.DataTables, path)
+ // TODO: Tem workaround
+ time.Sleep(time.Microsecond * 10)
if err = loader.PrepareLoad(); err != nil {
return err
}
diff --git a/pkg/vm/engine/tae/db/scheduler_test.go b/pkg/vm/engine/tae/db/scheduler_test.go
index 4f9ffcf0f..f8b61e033 100644
--- a/pkg/vm/engine/tae/db/scheduler_test.go
+++ b/pkg/vm/engine/tae/db/scheduler_test.go
@@ -121,9 +121,10 @@ func TestCheckpoint1(t *testing.T) {
assert.Nil(t, err)
assert.Nil(t, txn.Commit())
}
- time.Sleep(time.Millisecond * 20)
- {
- blockCnt := 0
+
+ blockCnt := 0
+ fn := func() bool {
+ blockCnt = 0
blockFn := func(entry *catalog.BlockEntry) error {
blockCnt++
return nil
@@ -131,9 +132,12 @@ func TestCheckpoint1(t *testing.T) {
processor := new(catalog.LoopProcessor)
processor.BlockFn = blockFn
err := db.Opts.Catalog.RecurLoop(processor)
- assert.Nil(t, err)
- assert.Equal(t, 2+3, blockCnt)
+ assert.NoError(t, err)
+ return blockCnt == 2+3
}
+ testutils.WaitExpect(1000, fn)
+ fn()
+ assert.Equal(t, 2+3, blockCnt)
}
func TestCheckpoint2(t *testing.T) {
--
GitLab