CheckDirectoryMarches: Ensure no files are missing

Author: tchap

pkg/operator/staticpod/file_utils_linux_test.go

@@ -7,6 +7,9 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"k8s.io/apimachinery/pkg/util/sets"
 )
 
 func TestSwapDirectoriesAtomic(t *testing.T) {
@@ -156,7 +159,11 @@ func (dir directoryState) CheckDirectoryMatches(t *testing.T, path string) {
 		t.Fatalf("Failed to read directory %q: %v", path, err)
 	}
 
+	expectedFiles := sets.KeySet(dir)
 	for _, entry := range entries {
+		// Mark the file as visited.
+		expectedFiles.Delete(entry.Name())
+
 		// Get the expected state.
 		state, ok := dir[entry.Name()]
 		if !ok {
@@ -182,7 +189,10 @@ func (dir directoryState) CheckDirectoryMatches(t *testing.T, path string) {
 			continue
 		}
 		if !bytes.Equal(state.Content, content) {
-			t.Errorf("Unexpected content on file %q:\n\texpected %v\n\tgot %v", entry.Name(), string(state.Content), string(content))
+			t.Errorf("Unexpected content in file %q:\n%v", entry.Name(), cmp.Diff(string(state.Content), string(content)))
 		}
 	}
+	if expectedFiles.Len() != 0 {
+		t.Errorf("Some expected files were not found in directory %q: %s", path, expectedFiles.UnsortedList())
+	}
 }