CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-02-03 22:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/cli: workaround TB.TemdDir path too long for Unix socket path

Browse Source 
Discover while testing v2.0.0 Github MR.

See: https://github.com/golang/go/issues/62614

While at it, also fix staticcheck linter on Windows.
This commit is contained in:
Cuong Manh Le
2025-10-09 20:14:27 +07:00
committed by Cuong Manh Le
parent c13a3c3c17
commit 90eddb8268
2 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
cmd/cli/http_log_test.go
View File

@@ -12,12 +12,21 @@ import (
"strings"
"testing"
"time"
"golang.org/x/net/nettest"
)
func unixDomainSocketPath(t *testing.T) string {
t.Helper()
sockPath, err := nettest.LocalPath()
if err != nil {
t.Fatalf("Failed to create temporary directory: %v", err)
}
return sockPath
}
func TestHTTPLogServer(t *testing.T) {
// Create a temporary socket path
tmpDir := t.TempDir()
sockPath := filepath.Join(tmpDir, "test.sock")
sockPath := unixDomainSocketPath(t)
// Create log channel
stopLogCh := make(chan struct{})
@@ -238,8 +247,8 @@ func TestHTTPLogServerInvalidSocketPath(t *testing.T) {
func TestHTTPLogServerSocketInUse(t *testing.T) {
// Create a temporary socket path
tmpDir := t.TempDir()
sockPath := filepath.Join(tmpDir, "test.sock")
sockPath := unixDomainSocketPath(t)
defer os.Remove(sockPath)
// Create the first server
stopLogCh1 := make(chan struct{})
@@ -261,15 +270,12 @@ func TestHTTPLogServerSocketInUse(t *testing.T) {
if !strings.Contains(err.Error(), "could not listen log socket") {
t.Errorf("Expected 'could not listen log socket' error, got: %v", err)
}
// Clean up
os.Remove(sockPath)
}
func TestHTTPLogServerConcurrentRequests(t *testing.T) {
// Create a temporary socket path
tmpDir := t.TempDir()
sockPath := filepath.Join(tmpDir, "test.sock")
sockPath := unixDomainSocketPath(t)
defer os.Remove(sockPath)
// Create log channel
stopLogCh := make(chan struct{})
@@ -348,15 +354,12 @@ func TestHTTPLogServerConcurrentRequests(t *testing.T) {
t.Errorf("Log '%s' was not stored", expectedLog)
}
}
// Clean up
os.Remove(sockPath)
}
func TestHTTPLogServerErrorHandling(t *testing.T) {
// Create a temporary socket path
tmpDir := t.TempDir()
sockPath := filepath.Join(tmpDir, "test.sock")
sockPath := unixDomainSocketPath(t)
defer os.Remove(sockPath)
// Create log channel
stopLogCh := make(chan struct{})
@@ -393,9 +396,6 @@ func TestHTTPLogServerErrorHandling(t *testing.T) {
t.Errorf("Expected status 200, got %d", resp.StatusCode)
}
})
// Clean up
os.Remove(sockPath)
}
func BenchmarkHTTPLogServer(b *testing.B) {
@@ -440,8 +440,8 @@ func BenchmarkHTTPLogServer(b *testing.B) {
func TestHTTPLogClient(t *testing.T) {
// Create a temporary socket path
tmpDir := t.TempDir()
sockPath := filepath.Join(tmpDir, "test.sock")
sockPath := unixDomainSocketPath(t)
defer os.Remove(sockPath)
// Create log channel
stopLogCh := make(chan struct{})
@@ -502,9 +502,6 @@ func TestHTTPLogClient(t *testing.T) {
t.Error("Timeout waiting for channel closure")
}
})
// Clean up
os.Remove(sockPath)
}
func TestHTTPLogClientServerUnavailable(t *testing.T) {
@@ -570,8 +567,8 @@ func BenchmarkHTTPLogClient(b *testing.B) {
func TestHTTPLogServerWithLogWriter(t *testing.T) {
// Create a temporary socket path
tmpDir := t.TempDir()
sockPath := filepath.Join(tmpDir, "test.sock")
sockPath := unixDomainSocketPath(t)
defer os.Remove(sockPath)
// Create log channel
stopLogCh := make(chan struct{})
@@ -632,8 +629,7 @@ func TestHTTPLogServerWithLogWriter(t *testing.T) {
t.Run("Empty logs endpoint", func(t *testing.T) {
// Create a new server for this test
tmpDir2 := t.TempDir()
sockPath2 := filepath.Join(tmpDir2, "test2.sock")
sockPath2 := unixDomainSocketPath(t)
stopLogCh2 := make(chan struct{})
go func() {
@@ -684,15 +680,12 @@ func TestHTTPLogServerWithLogWriter(t *testing.T) {
t.Error("Timeout waiting for channel closure")
}
})
// Clean up
os.Remove(sockPath)
}
func TestHTTPLogClientGetLogs(t *testing.T) {
// Create a temporary socket path
tmpDir := t.TempDir()
sockPath := filepath.Join(tmpDir, "test.sock")
sockPath := unixDomainSocketPath(t)
defer os.Remove(sockPath)
// Create log channel
stopLogCh := make(chan struct{})
@@ -731,8 +724,7 @@ func TestHTTPLogClientGetLogs(t *testing.T) {
t.Run("Get empty logs", func(t *testing.T) {
// Create a new client for empty logs test
tmpDir2 := t.TempDir()
sockPath2 := filepath.Join(tmpDir2, "test2.sock")
sockPath2 := unixDomainSocketPath(t)
stopLogCh2 := make(chan struct{})
go func() {
@@ -752,7 +744,4 @@ func TestHTTPLogClientGetLogs(t *testing.T) {
os.Remove(sockPath2)
})
// Clean up
os.Remove(sockPath)
}

7
nameservers_windows.go
View File

@@ -53,7 +53,7 @@ func dnsFns() []dnsFn {
}
func dnsFromAdapter(ctx context.Context) []string {
ctx, cancel := context.WithTimeout(context.Background(), defaultDNSAdapterTimeout)
ctx, cancel := context.WithTimeout(ctx, defaultDNSAdapterTimeout)
defer cancel()
var ns []string
@@ -297,11 +297,6 @@ func getDNSServers(ctx context.Context) ([]string, error) {
return ns, nil
}
// CurrentNameserversFromResolvconf returns a nil slice of strings.
func currentNameserversFromResolvconf() []string {
return nil
}
// checkDomainJoined checks if the machine is joined to an Active Directory domain
// Returns whether it's domain joined and the domain name if available
func checkDomainJoined(ctx context.Context) bool {