Fix failing tests on Darwin

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

pkg/cdi/cache.go

@@ -22,6 +22,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"runtime"
 	"sort"
 	"strings"
 	"sync"
@@ -529,17 +530,24 @@ func (w *watch) watch(fsw *fsnotify.Watcher, m *sync.Mutex, refresh func() error
 	if watch == nil {
 		return
 	}
+
+	eventMask := fsnotify.Rename | fsnotify.Remove | fsnotify.Write
+	// On macOS, we also need to watch for Create events.
+	if runtime.GOOS == "darwin" {
+		eventMask |= fsnotify.Create
+	}
+
 	for {
 		select {
 		case event, ok := <-watch.Events:
 			if !ok {
 				return
 			}
 
-			if (event.Op & (fsnotify.Rename | fsnotify.Remove | fsnotify.Write)) == 0 {
+			if (event.Op & eventMask) == 0 {
 				continue
 			}
-			if event.Op == fsnotify.Write {
+			if event.Op == fsnotify.Write || event.Op == fsnotify.Create {
 				if ext := filepath.Ext(event.Name); ext != ".json" && ext != ".yaml" {
 					continue
 				}

pkg/cdi/cache_test_darwin.go

@@ -0,0 +1,26 @@
+//go:build darwin
+// +build darwin
+
+/*
+   Copyright © 2021 The CDI Authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package cdi
+
+import "syscall"
+
+func osSync() {
+	_ = syscall.Sync()
+}

pkg/cdi/cache_test_unix.go

@@ -1,5 +1,5 @@
-//go:build !windows
-// +build !windows
+//go:build !windows && !darwin
+// +build !windows,!darwin
 
 /*
    Copyright © 2021 The CDI Authors

pkg/cdi/container-edits_test.go

@@ -17,6 +17,7 @@
 package cdi
 
 import (
+	"runtime"
 	"testing"
 
 	oci "github.com/opencontainers/runtime-spec/specs-go"
@@ -303,6 +304,13 @@ func TestValidateContainerEdits(t *testing.T) {
 }
 
 func TestApplyContainerEdits(t *testing.T) {
+	nullDeviceMajor := int64(1)
+	nullDeviceMinor := int64(3)
+	if runtime.GOOS == "darwin" {
+		nullDeviceMajor = 3
+		nullDeviceMinor = 2
+	}
+
 	type testCase struct {
 		name   string
 		spec   *oci.Spec
@@ -346,17 +354,17 @@ func TestApplyContainerEdits(t *testing.T) {
 						{
 							Path:  "/dev/null",
 							Type:  "c",
-							Major: 1,
-							Minor: 3,
+							Major: nullDeviceMajor,
+							Minor: nullDeviceMinor,
 						},
 					},
 					Resources: &oci.LinuxResources{
 						Devices: []oci.LinuxDeviceCgroup{
 							{
 								Allow:  true,
 								Type:   "c",
-								Major:  int64ptr(1),
-								Minor:  int64ptr(3),
+								Major:  &nullDeviceMajor,
+								Minor:  &nullDeviceMinor,
 								Access: "rwm",
 							},
 						},
@@ -389,17 +397,17 @@ func TestApplyContainerEdits(t *testing.T) {
 						{
 							Path:  "/dev/null",
 							Type:  "c",
-							Major: 1,
-							Minor: 3,
+							Major: nullDeviceMajor,
+							Minor: nullDeviceMinor,
 						},
 					},
 					Resources: &oci.LinuxResources{
 						Devices: []oci.LinuxDeviceCgroup{
 							{
 								Allow:  true,
 								Type:   "c",
-								Major:  int64ptr(1),
-								Minor:  int64ptr(3),
+								Major:  &nullDeviceMajor,
+								Minor:  &nullDeviceMinor,
 								Access: "rwm",
 							},
 						},