Skip to content

Commit 08381f4

Browse files
committed
Don't reassign assert and require
I started this pattern to save few characters, but it isn't really working when you have subtests. Signed-off-by: Kazuyoshi Kato <[email protected]>
1 parent 6729203 commit 08381f4

File tree

4 files changed

+106
-117
lines changed

4 files changed

+106
-117
lines changed

internal/fsutil.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func createTestExtImg(ctx context.Context, t *testing.T, extName string, testFil
7373
}
7474

7575
// CreateBlockDevice creates a block device, or block special file for testing
76-
func CreateBlockDevice(ctx context.Context, t *testing.T) (string, func()) {
76+
func CreateBlockDevice(ctx context.Context, t testing.TB) (string, func()) {
7777
t.Helper()
7878

7979
f, err := os.CreateTemp("", "")

runtime/jailer_integ_test.go

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,14 @@ func fsSafeTestName(tb testing.TB) string {
9191
}
9292

9393
func testJailer(t *testing.T, jailerConfig *proto.JailerConfig) {
94-
require := require.New(t)
95-
9694
client, err := containerd.New(integtest.ContainerdSockPath, containerd.WithDefaultRuntime(firecrackerRuntime))
97-
require.NoError(err, "unable to create client to containerd service at %s, is containerd running?", integtest.ContainerdSockPath)
95+
require.NoError(t, err, "unable to create client to containerd service at %s, is containerd running?", integtest.ContainerdSockPath)
9896
defer client.Close()
9997

10098
ctx := namespaces.WithNamespace(context.Background(), "default")
10199

102100
image, err := alpineImage(ctx, client, defaultSnapshotterName)
103-
require.NoError(err, "failed to get alpine image")
101+
require.NoError(t, err, "failed to get alpine image")
104102

105103
vmID := testNameToVMID(t.Name())
106104

@@ -120,30 +118,30 @@ func testJailer(t *testing.T, jailerConfig *proto.JailerConfig) {
120118
// If the drive files are bind-mounted, the files must be readable from the jailer's user.
121119
if jailerConfig != nil && jailerConfig.DriveExposePolicy == proto.DriveExposePolicy_BIND {
122120
f, err := os.CreateTemp("", fsSafeTestName(t)+"_rootfs")
123-
require.NoError(err)
121+
require.NoError(t, err)
124122
defer f.Close()
125123

126124
dst := f.Name()
127125

128126
// Copy the root drive before chown, since the file is used by other tests.
129127
err = copyFile(integtest.DefaultRuntimeConfig.RootDrive, dst, 0400)
130-
require.NoErrorf(err, "failed to copy a rootfs as %q", dst)
128+
require.NoErrorf(t, err, "failed to copy a rootfs as %q", dst)
131129

132130
err = os.Chown(dst, int(jailerConfig.UID), int(jailerConfig.GID))
133-
require.NoError(err, "failed to chown %q", dst)
131+
require.NoError(t, err, "failed to chown %q", dst)
134132

135133
request.RootDrive = &proto.FirecrackerRootDrive{HostPath: dst}
136134

137135
// The additional drive file is only used by this test.
138136
err = os.Chown(additionalDrive, int(jailerConfig.UID), int(jailerConfig.GID))
139-
require.NoError(err, "failed to chown %q", additionalDrive)
137+
require.NoError(t, err, "failed to chown %q", additionalDrive)
140138
}
141139

142140
fcClient, err := integtest.NewFCControlClient(integtest.ContainerdSockPath)
143-
require.NoError(err)
141+
require.NoError(t, err)
144142

145143
_, err = fcClient.CreateVM(ctx, &request)
146-
require.NoError(err)
144+
require.NoError(t, err)
147145

148146
c, err := client.NewContainer(ctx,
149147
vmID+"-container",
@@ -161,27 +159,27 @@ func testJailer(t *testing.T, jailerConfig *proto.JailerConfig) {
161159
}}),
162160
),
163161
)
164-
require.NoError(err)
162+
require.NoError(t, err)
165163

166164
stdout := startAndWaitTask(ctx, t, c)
167-
require.Equal("hello\nadditional drive\n", stdout)
165+
require.Equal(t, "hello\nadditional drive\n", stdout)
168166

169167
stat, err := os.Stat(filepath.Join(integtest.ShimBaseDir(), "default#"+vmID))
170-
require.NoError(err)
168+
require.NoError(t, err)
171169
assert.True(t, stat.IsDir())
172170

173171
err = c.Delete(ctx, containerd.WithSnapshotCleanup)
174-
require.NoError(err, "failed to delete a container")
172+
require.NoError(t, err, "failed to delete a container")
175173

176174
_, err = fcClient.StopVM(ctx, &proto.StopVMRequest{VMID: vmID})
177-
require.NoError(err)
175+
require.NoError(t, err)
178176

179177
_, err = os.Stat(filepath.Join(integtest.ShimBaseDir(), "default#"+vmID))
180178
assert.Error(t, err)
181179
assert.True(t, os.IsNotExist(err))
182180

183181
shimContents, err := os.ReadDir(integtest.ShimBaseDir())
184-
require.NoError(err)
182+
require.NoError(t, err)
185183
assert.Len(t, shimContents, 0)
186184
}
187185

@@ -199,28 +197,27 @@ func TestJailerCPUSet_Isolated(t *testing.T) {
199197
testJailer(t, config)
200198
}
201199

202-
func testAttachBlockDevice(t *testing.T, jailerConfig *proto.JailerConfig) {
203-
require := require.New(t)
200+
func testAttachBlockDevice(tb testing.TB, jailerConfig *proto.JailerConfig) {
204201
client, err := containerd.New(integtest.ContainerdSockPath, containerd.WithDefaultRuntime(firecrackerRuntime))
205-
require.NoError(err, "unable to create client to containerd service at %s, is containerd running?", integtest.ContainerdSockPath)
202+
require.NoError(tb, err, "unable to create client to containerd service at %s, is containerd running?", integtest.ContainerdSockPath)
206203
defer client.Close()
207204

208205
ctx := namespaces.WithNamespace(context.Background(), "default")
209206

210207
image, err := alpineImage(ctx, client, defaultSnapshotterName)
211-
require.NoError(err, "failed to get alpine image")
208+
require.NoError(tb, err, "failed to get alpine image")
212209

213210
fcClient, err := integtest.NewFCControlClient(integtest.ContainerdSockPath)
214-
require.NoError(err)
211+
require.NoError(tb, err)
215212

216-
vmID := testNameToVMID(t.Name())
213+
vmID := testNameToVMID(tb.Name())
217214

218-
device, cleanup := internal.CreateBlockDevice(ctx, t)
215+
device, cleanup := internal.CreateBlockDevice(ctx, tb)
219216
defer cleanup()
220217

221218
if jailerConfig != nil {
222219
err := os.Chown(device, int(jailerConfig.UID), int(jailerConfig.GID))
223-
require.NoError(err)
220+
require.NoError(tb, err)
224221
}
225222

226223
request := proto.CreateVMRequest{
@@ -233,27 +230,27 @@ func testAttachBlockDevice(t *testing.T, jailerConfig *proto.JailerConfig) {
233230

234231
// If the drive files are bind-mounted, the files must be readable from the jailer's user.
235232
if jailerConfig != nil && jailerConfig.DriveExposePolicy == proto.DriveExposePolicy_BIND {
236-
f, err := os.CreateTemp("", fsSafeTestName(t)+"_rootfs")
237-
require.NoError(err)
233+
f, err := os.CreateTemp("", fsSafeTestName(tb)+"_rootfs")
234+
require.NoError(tb, err)
238235
defer f.Close()
239236

240237
dst := f.Name()
241238

242239
// Copy the root drive before chown, since the file is used by other tests.
243240
err = copyFile(integtest.DefaultRuntimeConfig.RootDrive, dst, 0400)
244-
require.NoErrorf(err, "failed to copy a rootfs as %q", dst)
241+
require.NoErrorf(tb, err, "failed to copy a rootfs as %q", dst)
245242

246243
err = os.Chown(dst, int(jailerConfig.UID), int(jailerConfig.GID))
247-
require.NoError(err, "failed to chown %q", dst)
244+
require.NoError(tb, err, "failed to chown %q", dst)
248245

249246
request.RootDrive = &proto.FirecrackerRootDrive{HostPath: dst}
250247

251248
err = os.Chown(device, int(jailerConfig.UID), int(jailerConfig.GID))
252-
require.NoError(err, "failed to chown %q", device)
249+
require.NoError(tb, err, "failed to chown %q", device)
253250
}
254251

255252
_, err = fcClient.CreateVM(ctx, &request)
256-
require.NoError(err)
253+
require.NoError(tb, err)
257254

258255
// create a container to test bind mount block device into the container
259256
c, err := client.NewContainer(ctx,
@@ -272,26 +269,26 @@ func testAttachBlockDevice(t *testing.T, jailerConfig *proto.JailerConfig) {
272269
}}),
273270
),
274271
)
275-
require.NoError(err)
272+
require.NoError(tb, err)
276273

277-
stdout := startAndWaitTask(ctx, t, c)
278-
require.Equal("heyhey\n", stdout)
274+
stdout := startAndWaitTask(ctx, tb, c)
275+
require.Equal(tb, "heyhey\n", stdout)
279276

280277
stat, err := os.Stat(filepath.Join(integtest.ShimBaseDir(), "default#"+vmID))
281-
require.NoError(err)
282-
assert.True(t, stat.IsDir())
278+
require.NoError(tb, err)
279+
assert.True(tb, stat.IsDir())
283280

284281
err = c.Delete(ctx, containerd.WithSnapshotCleanup)
285-
require.NoError(err, "failed to delete a container-block-device")
282+
require.NoError(tb, err, "failed to delete a container-block-device")
286283

287284
_, err = fcClient.StopVM(ctx, &proto.StopVMRequest{VMID: vmID})
288-
require.NoError(err)
285+
require.NoError(tb, err)
289286

290287
_, err = os.Stat(filepath.Join(integtest.ShimBaseDir(), "default#"+vmID))
291-
assert.Error(t, err)
292-
assert.True(t, os.IsNotExist(err))
288+
assert.Error(tb, err)
289+
assert.True(tb, os.IsNotExist(err))
293290

294291
shimContents, err := os.ReadDir(integtest.ShimBaseDir())
295-
require.NoError(err)
296-
assert.Len(t, shimContents, 0)
292+
require.NoError(tb, err)
293+
assert.Len(tb, shimContents, 0)
297294
}

runtime/limits_integ_test.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,14 @@ import (
2727
func TestDiskLimit_Isolated(t *testing.T) {
2828
integtest.Prepare(t)
2929

30-
assert := assert.New(t)
31-
require := require.New(t)
32-
3330
ctx := namespaces.WithNamespace(context.Background(), "default")
3431

3532
client, err := containerd.New(integtest.ContainerdSockPath, containerd.WithDefaultRuntime(firecrackerRuntime))
36-
require.NoError(err, "unable to create client to containerd service at %s, is containerd running?", integtest.ContainerdSockPath)
33+
require.NoError(t, err, "unable to create client to containerd service at %s, is containerd running?", integtest.ContainerdSockPath)
3734
defer client.Close()
3835

3936
image, err := alpineImage(ctx, client, defaultSnapshotterName)
40-
require.NoError(err, "failed to get alpine image")
37+
require.NoError(t, err, "failed to get alpine image")
4138

4239
// Right now, both naive snapshotter and devmapper snapshotter are configured to have 1024MB image size.
4340
// The former is hard-coded since the snapshotter is not for production. The latter is configured in tools/docker/entrypoint.sh.
@@ -54,14 +51,14 @@ func TestDiskLimit_Isolated(t *testing.T) {
5451
)
5552
defer func() {
5653
err = container.Delete(ctx, containerd.WithSnapshotCleanup)
57-
require.NoError(err, "failed to delete a container")
54+
require.NoError(t, err, "failed to delete a container")
5855
}()
5956

6057
result, err := integtest.RunTask(ctx, container)
61-
require.NoError(err, "failed to create a container")
58+
require.NoError(t, err, "failed to create a container")
6259

63-
assert.Equal(uint32(1), result.ExitCode, "writing 2GB must fail")
64-
assert.Equal(`952+0 records in
60+
assert.Equal(t, uint32(1), result.ExitCode, "writing 2GB must fail")
61+
assert.Equal(t, `952+0 records in
6562
951+0 records out
6663
`, result.Stderr, "but it must be able to write ~1024MB")
6764
}

0 commit comments

Comments
 (0)