fix tests

juicedata · May 12, 2023 · c9b88f2 · c9b88f2
1 parent 364311d
commit c9b88f2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/pkg/fuse/fuse_test.go b/pkg/fuse/fuse_test.go
@@ -44,7 +44,7 @@ import (
 )
 
 func format(url string) {
-	m := meta.NewClient(url, &meta.Config{})
+	m := meta.NewClient(url, nil)
 	format := &meta.Format{
 		Name:      "test",
 		UUID:      uuid.New().String(),
@@ -63,11 +63,8 @@ func mount(url, mp string) {
 		log.Fatalf("create %s: %s", mp, err)
 	}
 
-	metaConf := &meta.Config{
-		Retries:    10,
-		Strict:     true,
-		MountPoint: mp,
-	}
+	metaConf := meta.DefaultConf()
+	metaConf.MountPoint = mp
 	m := meta.NewClient(url, metaConf)
 	format, err := m.Load(true)
 	if err != nil {

diff --git a/pkg/meta/utils.go b/pkg/meta/utils.go
@@ -560,7 +560,7 @@ func (m *baseMeta) getTreeSummary(ctx Context, tree *TreeSummary, depth, topN ui
 }
 
 func (m *baseMeta) atimeNeedsUpdate(attr *Attr, now time.Time) bool {
-	return relatimeNeedUpdate(attr, now) ||
+	return m.conf.AtimeMode != NoAtime && relatimeNeedUpdate(attr, now) ||
 		// update atime only for > 1 second accesses
 		m.conf.AtimeMode == StrictAtime && now.Sub(time.Unix(attr.Atime, int64(attr.Atimensec))) > time.Second
 }

diff --git a/pkg/meta/utils_test.go b/pkg/meta/utils_test.go
@@ -61,30 +61,29 @@ func TestAtimeNeedsUpdate(t *testing.T) {
 	attr := &Attr{
 		Atime: 1000,
 	}
-	if m.atimeNeedsUpdate(attr, time.Now()) {
+	now := time.Now()
+	if m.atimeNeedsUpdate(attr, now) {
 		t.Fatal("atime updated for noatime")
 	}
 
 	m.conf.AtimeMode = RelAtime
-	if !m.atimeNeedsUpdate(attr, time.Now()) {
+	if !m.atimeNeedsUpdate(attr, now) {
 		t.Fatal("atime not updated for relatime")
 	}
-	attr.Atime = time.Now().Unix()
-	if m.atimeNeedsUpdate(attr, time.Now()) {
+	attr.Atime = now.Unix()
+	if m.atimeNeedsUpdate(attr, now) {
 		t.Fatal("atime updated for relatime")
 	}
 
 	m.conf.AtimeMode = StrictAtime
-	time.Sleep(2 * time.Second)
-	if !m.atimeNeedsUpdate(attr, time.Now()) {
+	attr.Atime = now.Unix() - 2
+	if !m.atimeNeedsUpdate(attr, now) {
 		t.Fatal("atime not updated for strictatime")
 	}
 
-	now := time.Now()
-	attr.Atime = now.Unix()
+	attr.Atime = now.Unix() - 1
 	attr.Atimensec = uint32(now.Nanosecond())
-	time.Sleep(time.Millisecond)
-	if m.atimeNeedsUpdate(attr, time.Now()) {
+	if m.atimeNeedsUpdate(attr, now) {
 		t.Fatal("atime updated for strictatime when < 1s")
 	}
 }