Merge pull request #3991 from xiang90/fix_lock

pkg/fileutil: make TestLockAndUnlock less flaky on CI

pkg/fileutil/lock_test.go

@@ -78,7 +78,7 @@ func TestLockAndUnlock(t *testing.T) {
 	select {
 	case <-locked:
 		t.Error("unexpected unblocking")
-	case <-time.After(10 * time.Millisecond):
+	case <-time.After(100 * time.Millisecond):
 	}
 
 	// unlock
@@ -90,7 +90,7 @@ func TestLockAndUnlock(t *testing.T) {
 	// the previously blocked routine should be unblocked
 	select {
 	case <-locked:
-	case <-time.After(20 * time.Millisecond):
+	case <-time.After(1 * time.Second):
 		t.Error("unexpected blocking")
 	}
 }