Merge pull request #915 from afbjorklund/windows-unittests

Fix test failures on windows, mostly paths

Author: AkihiroSuda

pkg/cidata/template.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io/fs"
-	"path/filepath"
+	"path"
 
 	"github.com/lima-vm/lima/pkg/iso9660util"
 
@@ -82,7 +82,7 @@ func ValidateTemplateArgs(args TemplateArgs) error {
 	}
 	for i, m := range args.Mounts {
 		f := m.MountPoint
-		if !filepath.IsAbs(f) {
+		if !path.IsAbs(f) {
 			return fmt.Errorf("field mounts[%d] must be absolute, got %q", i, f)
 		}
 	}

pkg/hostagent/dns/dns_test.go

@@ -1,15 +1,18 @@
 package dns
 
 import (
+	"fmt"
 	"io"
 	"log"
 	"net"
 	"regexp"
+	"runtime"
 	"testing"
 
 	"github.com/foxcpp/go-mockdns"
 	"github.com/miekg/dns"
 	"gotest.tools/v3/assert"
+	"gotest.tools/v3/assert/cmp"
 )
 
 var (
@@ -43,6 +46,10 @@ func TestTXTRecords(t *testing.T) {
 	}, log.New(io.Discard, "mockdns server: ", log.LstdFlags), false)
 	defer srv.Close()
 
+	if runtime.GOOS == "windows" {
+		// "On Windows, the resolver always uses C library functions, such as GetAddrInfo and DnsQuery."
+		t.Skip()
+	}
 	srv.PatchNet(net.DefaultResolver)
 	defer mockdns.UnpatchNet(net.DefaultResolver)
 
@@ -56,8 +63,17 @@ func TestTXTRecords(t *testing.T) {
 				req := new(dns.Msg)
 				req.SetQuestion(dns.Fqdn(testDomains[i]), dns.TypeTXT)
 				h.ServeDNS(w, req)
-				regex_check := regexp.MustCompile(expectedResults[i]).MatchString(dnsResult.String())
-				assert.Assert(t, regex_check)
+				regex_match := func(value string, pattern string) cmp.Comparison {
+					return func() cmp.Result {
+						re := regexp.MustCompile(pattern)
+						if re.MatchString(value) {
+							return cmp.ResultSuccess
+						}
+						return cmp.ResultFailure(
+							fmt.Sprintf("%q did not match pattern %q", value, pattern))
+					}
+				}
+				assert.Assert(t, regex_match(dnsResult.String(), expectedResults[i]))
 			}
 		}
 	})

pkg/limayaml/defaults.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net"
 	"os"
-	osuser "os/user"
 	"path/filepath"
 	"runtime"
 	"strconv"
@@ -569,7 +568,7 @@ func FillPortForwardDefaults(rule *PortForward, instDir string) {
 	if rule.HostSocket != "" {
 		tmpl, err := template.New("").Parse(rule.HostSocket)
 		if err == nil {
-			user, _ := osuser.Current()
+			user, _ := osutil.LimaUser(false)
 			home, _ := os.UserHomeDir()
 			limaHome, _ := dirnames.LimaDir()
 			data := map[string]string{

pkg/limayaml/validate.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -217,7 +218,7 @@ func Validate(y LimaYAML, warn bool) error {
 			return fmt.Errorf("field `%s.hostPortRange` must specify the same number of ports as field `%s.guestPortRange`", field, field)
 		}
 		if rule.GuestSocket != "" {
-			if !filepath.IsAbs(rule.GuestSocket) {
+			if !path.IsAbs(rule.GuestSocket) {
 				return fmt.Errorf("field `%s.guestSocket` must be an absolute path", field)
 			}
 			if rule.HostSocket == "" && rule.HostPortRange[1]-rule.HostPortRange[0] > 0 {

pkg/networks/commands.go

@@ -2,6 +2,7 @@ package networks
 
 import (
 	"fmt"
+	"path/filepath"
 
 	"github.com/lima-vm/lima/pkg/osutil"
 	"github.com/lima-vm/lima/pkg/store/dirnames"
@@ -23,16 +24,16 @@ func (config *NetworksConfig) Check(name string) error {
 }
 
 func (config *NetworksConfig) VDESock(name string) string {
-	return fmt.Sprintf("%s/%s.ctl", config.Paths.VarRun, name)
+	return filepath.Join(config.Paths.VarRun, fmt.Sprintf("%s.ctl", name))
 }
 
 func (config *NetworksConfig) PIDFile(name, daemon string) string {
-	return fmt.Sprintf("%s/%s_%s.pid", config.Paths.VarRun, name, daemon)
+	return filepath.Join(config.Paths.VarRun, fmt.Sprintf("%s_%s.pid", name, daemon))
 }
 
 func (config *NetworksConfig) LogFile(name, daemon, stream string) string {
 	networksDir, _ := dirnames.LimaNetworksDir()
-	return fmt.Sprintf("%s/%s_%s.%s.log", networksDir, name, daemon, stream)
+	return filepath.Join(networksDir, fmt.Sprintf("%s_%s.%s.log", name, daemon, stream))
 }
 
 func (config *NetworksConfig) User(daemon string) (osutil.User, error) {

pkg/networks/commands_darwin_test.go

@@ -0,0 +1,23 @@
+package networks
+
+import (
+	"testing"
+
+	"gotest.tools/v3/assert"
+)
+
+func TestVDESock(t *testing.T) {
+	config, err := DefaultConfig()
+	assert.NilError(t, err)
+
+	vdeSock := config.VDESock("foo")
+	assert.Equal(t, vdeSock, "/private/var/run/lima/foo.ctl")
+}
+
+func TestPIDFile(t *testing.T) {
+	config, err := DefaultConfig()
+	assert.NilError(t, err)
+
+	pidFile := config.PIDFile("name", "daemon")
+	assert.Equal(t, pidFile, "/private/var/run/lima/name_daemon.pid")
+}

pkg/networks/commands_test.go

@@ -21,22 +21,6 @@ func TestCheck(t *testing.T) {
 	assert.ErrorContains(t, err, "not defined")
 }
 
-func TestVDESock(t *testing.T) {
-	config, err := DefaultConfig()
-	assert.NilError(t, err)
-
-	vdeSock := config.VDESock("foo")
-	assert.Equal(t, vdeSock, "/private/var/run/lima/foo.ctl")
-}
-
-func TestPIDFile(t *testing.T) {
-	config, err := DefaultConfig()
-	assert.NilError(t, err)
-
-	pidFile := config.PIDFile("name", "daemon")
-	assert.Equal(t, pidFile, "/private/var/run/lima/name_daemon.pid")
-}
-
 func TestLogFile(t *testing.T) {
 	config, err := DefaultConfig()
 	assert.NilError(t, err)
@@ -54,6 +38,10 @@ func TestUser(t *testing.T) {
 		// The "everyone" group is a specific macOS feature to include non-local accounts.
 		config.Group = "staff"
 	}
+	if runtime.GOOS == "windows" {
+		// unimplemented
+		t.Skip()
+	}
 
 	user, err := config.User(Switch)
 	assert.NilError(t, err)
@@ -87,23 +75,27 @@ func TestStartCmd(t *testing.T) {
 	config, err := DefaultConfig()
 	assert.NilError(t, err)
 
+	varRunDir := filepath.Join("/", "private", "var", "run", "lima")
+
 	cmd := config.StartCmd("shared", Switch)
-	assert.Equal(t, cmd, "/opt/vde/bin/vde_switch --pidfile=/private/var/run/lima/shared_switch.pid "+
-		"--sock=/private/var/run/lima/shared.ctl --group=everyone --dirmode=0770 --nostdin")
+	assert.Equal(t, cmd, "/opt/vde/bin/vde_switch --pidfile="+filepath.Join(varRunDir, "shared_switch.pid")+" "+
+		"--sock="+filepath.Join(varRunDir, "shared.ctl")+" --group=everyone --dirmode=0770 --nostdin")
 
 	cmd = config.StartCmd("shared", VMNet)
-	assert.Equal(t, cmd, "/opt/vde/bin/vde_vmnet --pidfile=/private/var/run/lima/shared_vmnet.pid --vde-group=everyone --vmnet-mode=shared "+
-		"--vmnet-gateway=192.168.105.1 --vmnet-dhcp-end=192.168.105.254 --vmnet-mask=255.255.255.0 /private/var/run/lima/shared.ctl")
+	assert.Equal(t, cmd, "/opt/vde/bin/vde_vmnet --pidfile="+filepath.Join(varRunDir, "shared_vmnet.pid")+" --vde-group=everyone --vmnet-mode=shared "+
+		"--vmnet-gateway=192.168.105.1 --vmnet-dhcp-end=192.168.105.254 --vmnet-mask=255.255.255.0 "+filepath.Join(varRunDir, "shared.ctl"))
 
 	cmd = config.StartCmd("bridged", VMNet)
-	assert.Equal(t, cmd, "/opt/vde/bin/vde_vmnet --pidfile=/private/var/run/lima/bridged_vmnet.pid --vde-group=everyone --vmnet-mode=bridged "+
-		"--vmnet-interface=en0 /private/var/run/lima/bridged.ctl")
+	assert.Equal(t, cmd, "/opt/vde/bin/vde_vmnet --pidfile="+filepath.Join(varRunDir, "bridged_vmnet.pid")+" --vde-group=everyone --vmnet-mode=bridged "+
+		"--vmnet-interface=en0 "+filepath.Join(varRunDir, "bridged.ctl"))
 }
 
 func TestStopCmd(t *testing.T) {
 	config, err := DefaultConfig()
 	assert.NilError(t, err)
 
+	varRunDir := filepath.Join("/", "private", "var", "run", "lima")
+
 	cmd := config.StopCmd("name", "daemon")
-	assert.Equal(t, cmd, "/usr/bin/pkill -F /private/var/run/lima/name_daemon.pid")
+	assert.Equal(t, cmd, "/usr/bin/pkill -F "+filepath.Join(varRunDir, "name_daemon.pid"))
 }