浏览代码

chore(model): slightly deflake TestRecvOnlyRevertOwnID (#10390)

Signed-off-by: Jakob Borg <[email protected]>
Jakob Borg 1 月之前
父节点
当前提交
3382ccc3f1
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      lib/model/folder_recvonly_test.go

+ 3 - 2
lib/model/folder_recvonly_test.go

@@ -459,6 +459,7 @@ func TestRecvOnlyRevertOwnID(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	defer cancel()
 	go func() {
 	go func() {
+		defer cancel()
 		for {
 		for {
 			select {
 			select {
 			case <-ctx.Done():
 			case <-ctx.Done():
@@ -466,9 +467,9 @@ func TestRecvOnlyRevertOwnID(t *testing.T) {
 			case <-sub.C():
 			case <-sub.C():
 				if file, _ := m.testCurrentFolderFile(f.ID, name); file.Deleted {
 				if file, _ := m.testCurrentFolderFile(f.ID, name); file.Deleted {
 					t.Error("local file was deleted")
 					t.Error("local file was deleted")
-					cancel()
+					return
 				} else if file.IsEquivalent(fi, f.modTimeWindow) {
 				} else if file.IsEquivalent(fi, f.modTimeWindow) {
-					cancel() // That's what we are waiting for
+					return // That's what we are waiting for
 				}
 				}
 			}
 			}
 		}
 		}