Merge pull request #987 from dgageot/fix-979

Fix race conditions in TestWatch
GoogleContainerTools · Sep 18, 2018 · f728fd9 · f728fd9
2 parents 61a8287 + 284cc9e
commit f728fd9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/pkg/skaffold/watch/changes.go b/pkg/skaffold/watch/changes.go
@@ -51,6 +51,10 @@ func lastModified(paths []string) (time.Time, error) {
 	for _, path := range paths {
 		stat, err := os.Stat(path)
 		if err != nil {
+			if os.IsNotExist(err) {
+				continue // Ignore files that don't exist
+			}
+
 			return last, errors.Wrapf(err, "unable to stat file %s", path)
 		}
 

diff --git a/pkg/skaffold/watch/watch_test.go b/pkg/skaffold/watch/watch_test.go
@@ -76,8 +76,11 @@ func TestWatch(t *testing.T) {
 
 			// Run the watcher
 			ctx, cancel := context.WithCancel(context.Background())
+			var stopped sync.WaitGroup
+			stopped.Add(1)
 			go func() {
 				err = watcher.Run(ctx, 10*time.Millisecond, somethingChanged.callNoErr)
+				stopped.Done()
 				testutil.CheckError(t, false, err)
 			}()
 
@@ -87,6 +90,7 @@ func TestWatch(t *testing.T) {
 			folderChanged.wait()
 			somethingChanged.wait()
 			cancel()
+			stopped.Wait() // Make sure the watcher is stopped before deleting the tmp folder
 		})
 	}
 }