Skip to content

Commit 33dcb99

Browse files
committed
libct/nsenter/nsenter_test.go: logging nits
- add missing colons before error message; - unify error messages after cmd.Start and cmd.Wait, so that they show context and the error itself. Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 78b2715 commit 33dcb99

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

libcontainer/nsenter/nsenter_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestNsenterValidPaths(t *testing.T) {
3434
}
3535

3636
if err := cmd.Start(); err != nil {
37-
t.Fatalf("nsenter failed to start %v", err)
37+
t.Fatalf("nsenter failed to start: %v", err)
3838
}
3939
child.Close()
4040

@@ -55,7 +55,7 @@ func TestNsenterValidPaths(t *testing.T) {
5555
initWaiter(t, parent)
5656

5757
if err := cmd.Wait(); err != nil {
58-
t.Fatalf("nsenter exits with a non-zero exit status")
58+
t.Fatalf("nsenter error: %v", err)
5959
}
6060

6161
reapChildren(t, parent)
@@ -76,7 +76,7 @@ func TestNsenterInvalidPaths(t *testing.T) {
7676
}
7777

7878
if err := cmd.Start(); err != nil {
79-
t.Fatal(err)
79+
t.Fatalf("nsenter failed to start: %v", err)
8080
}
8181
child.Close()
8282

@@ -115,7 +115,7 @@ func TestNsenterIncorrectPathType(t *testing.T) {
115115
}
116116

117117
if err := cmd.Start(); err != nil {
118-
t.Fatal(err)
118+
t.Fatalf("nsenter failed to start: %v", err)
119119
}
120120
child.Close()
121121

@@ -135,7 +135,7 @@ func TestNsenterIncorrectPathType(t *testing.T) {
135135

136136
initWaiter(t, parent)
137137
if err := cmd.Wait(); err == nil {
138-
t.Fatalf("nsenter exits with a zero exit status")
138+
t.Fatalf("nsenter error: %v", err)
139139
}
140140
}
141141

@@ -158,7 +158,7 @@ func TestNsenterChildLogging(t *testing.T) {
158158
}
159159

160160
if err := cmd.Start(); err != nil {
161-
t.Fatalf("nsenter failed to start %v", err)
161+
t.Fatalf("nsenter failed to start: %v", err)
162162
}
163163
child.Close()
164164
logwrite.Close()
@@ -181,7 +181,7 @@ func TestNsenterChildLogging(t *testing.T) {
181181

182182
getLogs(t, logread)
183183
if err := cmd.Wait(); err != nil {
184-
t.Fatalf("nsenter exits with a non-zero exit status")
184+
t.Fatalf("nsenter error: %v", err)
185185
}
186186

187187
reapChildren(t, parent)

0 commit comments

Comments
 (0)