Skip to content

Commit 8e12d5c

Browse files
authored
fix: lint
Signed-off-by: GitHub <[email protected]>
1 parent 6ac6473 commit 8e12d5c

File tree

2 files changed

+32
-8
lines changed

2 files changed

+32
-8
lines changed

cns/deviceplugin/server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestServer_Run_CleansUpExistingSocket(t *testing.T) {
2525
socketPath := filepath.Join(tmpDir, "test.sock")
2626

2727
// Create a dummy file at the socket path to simulate a stale socket
28-
if err := os.WriteFile(socketPath, []byte("stale socket"), 0644); err != nil {
28+
if err := os.WriteFile(socketPath, []byte("stale socket"), 0600); err != nil {
2929
t.Fatalf("failed to create dummy socket file: %v", err)
3030
}
3131

cns/deviceplugin/socketwatcher_test.go

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ import (
1313

1414
func TestWatchContextCancelled(t *testing.T) {
1515
ctx, cancel := context.WithCancel(context.Background())
16-
logger, _ := zap.NewDevelopment()
16+
logger, err := zap.NewDevelopment()
17+
if err != nil {
18+
t.Fatalf("failed to create logger: %v", err)
19+
}
1720
s := deviceplugin.NewSocketWatcher(logger)
1821
done := make(chan struct{})
1922
go func(done chan struct{}) {
@@ -44,14 +47,21 @@ func TestWatchSocketDeleted(t *testing.T) {
4447
if err != nil {
4548
t.Fatalf("error creating temporary directory: %v", err)
4649
}
47-
defer os.RemoveAll(tempDir) // Ensure the directory is cleaned up
50+
defer func() {
51+
if err := os.RemoveAll(tempDir); err != nil {
52+
t.Fatalf("failed to remove temp dir: %v", err)
53+
}
54+
}() // Ensure the directory is cleaned up
4855

4956
socket := filepath.Join(tempDir, "to-be-deleted.sock")
5057
if _, err := os.Create(socket); err != nil {
5158
t.Fatalf("error creating test file %s: %v", socket, err)
5259
}
5360

54-
logger, _ := zap.NewDevelopment()
61+
logger, err := zap.NewDevelopment()
62+
if err != nil {
63+
t.Fatalf("failed to create logger: %v", err)
64+
}
5565
s := deviceplugin.NewSocketWatcher(logger, deviceplugin.SocketWatcherStatInterval(time.Second))
5666
done := make(chan struct{})
5767
go func(done chan struct{}) {
@@ -84,14 +94,21 @@ func TestWatchSocketTwice(t *testing.T) {
8494
if err != nil {
8595
t.Fatalf("error creating temporary directory: %v", err)
8696
}
87-
defer os.RemoveAll(tempDir) // Ensure the directory is cleaned up
97+
defer func() {
98+
if err := os.RemoveAll(tempDir); err != nil {
99+
t.Fatalf("failed to remove temp dir: %v", err)
100+
}
101+
}() // Ensure the directory is cleaned up
88102

89103
socket := filepath.Join(tempDir, "to-be-deleted.sock")
90104
if _, err := os.Create(socket); err != nil {
91105
t.Fatalf("error creating test file %s: %v", socket, err)
92106
}
93107

94-
logger, _ := zap.NewDevelopment()
108+
logger, err := zap.NewDevelopment()
109+
if err != nil {
110+
t.Fatalf("failed to create logger: %v", err)
111+
}
95112
s := deviceplugin.NewSocketWatcher(logger, deviceplugin.SocketWatcherStatInterval(time.Second))
96113
done1 := make(chan struct{})
97114
done2 := make(chan struct{})
@@ -141,14 +158,21 @@ func TestWatchSocketCleanup(t *testing.T) {
141158
if err != nil {
142159
t.Fatalf("error creating temporary directory: %v", err)
143160
}
144-
defer os.RemoveAll(tempDir) // Ensure the directory is cleaned up
161+
defer func() {
162+
if err := os.RemoveAll(tempDir); err != nil {
163+
t.Fatalf("failed to remove temp dir: %v", err)
164+
}
165+
}() // Ensure the directory is cleaned up
145166

146167
socket := filepath.Join(tempDir, "to-be-deleted.sock")
147168
if _, err := os.Create(socket); err != nil {
148169
t.Fatalf("error creating test file %s: %v", socket, err)
149170
}
150171

151-
logger, _ := zap.NewDevelopment()
172+
logger, err := zap.NewDevelopment()
173+
if err != nil {
174+
t.Fatalf("failed to create logger: %v", err)
175+
}
152176
// Use a short interval for faster test execution
153177
s := deviceplugin.NewSocketWatcher(logger, deviceplugin.SocketWatcherStatInterval(100*time.Millisecond))
154178

0 commit comments

Comments
 (0)