Skip to content

Commit 85e8221

Browse files
estespestesp
committed
Tests should set up snapshot prior to any use of fs
These tests would have failed if any image had a USER declaration in it, but because the test image never has, these were never caught. Adding supplemental GIDs on any image revealed the issue. Signed-off-by: Phil Estes <[email protected]>
1 parent 13931e4 commit 85e8221

5 files changed

+45
-48
lines changed

‎benchmark_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func BenchmarkContainerCreate(b *testing.B) {
5757
b.ResetTimer()
5858
for i := 0; i < b.N; i++ {
5959
id := fmt.Sprintf("%s-%d", b.Name(), i)
60-
container, err := client.NewContainer(ctx, id, WithSpec(spec), WithNewSnapshot(id, image))
60+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithSpec(spec))
6161
if err != nil {
6262
b.Error(err)
6363
return
@@ -98,7 +98,7 @@ func BenchmarkContainerStart(b *testing.B) {
9898

9999
for i := 0; i < b.N; i++ {
100100
id := fmt.Sprintf("%s-%d", b.Name(), i)
101-
container, err := client.NewContainer(ctx, id, WithSpec(spec), WithNewSnapshot(id, image))
101+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithSpec(spec))
102102
if err != nil {
103103
b.Error(err)
104104
return

‎container_checkpoint_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ func TestCheckpointRestorePTY(t *testing.T) {
5353
t.Fatal(err)
5454
}
5555
container, err := client.NewContainer(ctx, id,
56+
WithNewSnapshot(id, image),
5657
WithNewSpec(oci.WithImageConfig(image),
5758
oci.WithProcessArgs("sh", "-c", "read A; echo z${A}z"),
58-
oci.WithTTY),
59-
WithNewSnapshot(id, image))
59+
oci.WithTTY))
6060
if err != nil {
6161
t.Fatal(err)
6262
}
@@ -157,7 +157,7 @@ func TestCheckpointRestore(t *testing.T) {
157157
if err != nil {
158158
t.Fatal(err)
159159
}
160-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
160+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "100")))
161161
if err != nil {
162162
t.Fatal(err)
163163
}
@@ -226,7 +226,7 @@ func TestCheckpointRestoreNewContainer(t *testing.T) {
226226
if err != nil {
227227
t.Fatal(err)
228228
}
229-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
229+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "100")))
230230
if err != nil {
231231
t.Fatal(err)
232232
}
@@ -306,7 +306,7 @@ func TestCheckpointLeaveRunning(t *testing.T) {
306306
if err != nil {
307307
t.Fatal(err)
308308
}
309-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
309+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "100")))
310310
if err != nil {
311311
t.Fatal(err)
312312
}

‎container_linux_test.go

+14-15
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@ func TestTaskUpdate(t *testing.T) {
7070
}
7171
return nil
7272
}
73-
container, err := client.NewContainer(ctx, id,
74-
WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "30"), memory),
75-
WithNewSnapshot(id, image))
73+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image),
74+
WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "30"), memory))
7675
if err != nil {
7776
t.Fatal(err)
7877
}
@@ -145,7 +144,7 @@ func TestShimInCgroup(t *testing.T) {
145144
if err != nil {
146145
t.Fatal(err)
147146
}
148-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "30")), WithNewSnapshot(id, image))
147+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "30")))
149148
if err != nil {
150149
t.Fatal(err)
151150
}
@@ -208,7 +207,7 @@ func TestDaemonRestart(t *testing.T) {
208207
t.Fatal(err)
209208
}
210209

211-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "30")), WithNewSnapshot(id, image))
210+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "30")))
212211
if err != nil {
213212
t.Fatal(err)
214213
}
@@ -280,7 +279,7 @@ func TestContainerPTY(t *testing.T) {
280279
t.Fatal(err)
281280
}
282281

283-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), oci.WithTTY, withProcessArgs("echo", "hello")), WithNewSnapshot(id, image))
282+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), oci.WithTTY, withProcessArgs("echo", "hello")))
284283
if err != nil {
285284
t.Fatal(err)
286285
}
@@ -357,7 +356,7 @@ func TestContainerAttach(t *testing.T) {
357356
t.Fatal(err)
358357
}
359358

360-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withCat()), WithNewSnapshot(id, image))
359+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withCat()))
361360
if err != nil {
362361
t.Fatal(err)
363362
}
@@ -652,7 +651,7 @@ func TestContainerAttachProcess(t *testing.T) {
652651
t.Fatal(err)
653652
}
654653

655-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
654+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")))
656655
if err != nil {
657656
t.Fatal(err)
658657
}
@@ -894,7 +893,7 @@ func TestDaemonRestartWithRunningShim(t *testing.T) {
894893
if err != nil {
895894
t.Fatal(err)
896895
}
897-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
896+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "100")))
898897
if err != nil {
899898
t.Fatal(err)
900899
}
@@ -978,8 +977,8 @@ func TestContainerRuntimeOptionsv1(t *testing.T) {
978977

979978
container, err := client.NewContainer(
980979
ctx, id,
981-
WithNewSpec(oci.WithImageConfig(image), withExitStatus(7)),
982980
WithNewSnapshot(id, image),
981+
WithNewSpec(oci.WithImageConfig(image), withExitStatus(7)),
983982
WithRuntime("io.containerd.runtime.v1.linux", &runctypes.RuncOptions{Runtime: "no-runc"}),
984983
)
985984
if err != nil {
@@ -1021,8 +1020,8 @@ func TestContainerRuntimeOptionsv2(t *testing.T) {
10211020

10221021
container, err := client.NewContainer(
10231022
ctx, id,
1024-
WithNewSpec(oci.WithImageConfig(image), withExitStatus(7)),
10251023
WithNewSnapshot(id, image),
1024+
WithNewSpec(oci.WithImageConfig(image), withExitStatus(7)),
10261025
WithRuntime("io.containerd.runc.v1", &options.Options{BinaryName: "no-runc"}),
10271026
)
10281027
if err != nil {
@@ -1164,9 +1163,9 @@ func testUserNamespaces(t *testing.T, readonlyRootFS bool) {
11641163
oci.WithUserNamespace(0, 1000, 10000),
11651164
)}
11661165
if readonlyRootFS {
1167-
opts = append(opts, WithRemappedSnapshotView(id, image, 1000, 1000))
1166+
opts = append([]NewContainerOpts{WithRemappedSnapshotView(id, image, 1000, 1000)}, opts...)
11681167
} else {
1169-
opts = append(opts, WithRemappedSnapshot(id, image, 1000, 1000))
1168+
opts = append([]NewContainerOpts{WithRemappedSnapshot(id, image, 1000, 1000)}, opts...)
11701169
}
11711170

11721171
container, err := client.NewContainer(ctx, id, opts...)
@@ -1247,7 +1246,7 @@ func TestTaskResize(t *testing.T) {
12471246
if err != nil {
12481247
t.Fatal(err)
12491248
}
1250-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withExitStatus(7)), WithNewSnapshot(id, image))
1249+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withExitStatus(7)))
12511250
if err != nil {
12521251
t.Fatal(err)
12531252
}
@@ -1503,7 +1502,7 @@ func TestContainerNoSTDIN(t *testing.T) {
15031502
if err != nil {
15041503
t.Fatal(err)
15051504
}
1506-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withExitStatus(0)), WithNewSnapshot(id, image))
1505+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withExitStatus(0)))
15071506
if err != nil {
15081507
t.Fatal(err)
15091508
}

‎container_test.go

+23-25
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func TestContainerStart(t *testing.T) {
119119
if err != nil {
120120
t.Fatal(err)
121121
}
122-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withExitStatus(7)), WithNewSnapshot(id, image))
122+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withExitStatus(7)))
123123
if err != nil {
124124
t.Fatal(err)
125125
}
@@ -183,7 +183,7 @@ func TestContainerOutput(t *testing.T) {
183183
if err != nil {
184184
t.Fatal(err)
185185
}
186-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("echo", expected)), WithNewSnapshot(id, image))
186+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("echo", expected)))
187187
if err != nil {
188188
t.Fatal(err)
189189
}
@@ -252,7 +252,7 @@ func TestContainerExec(t *testing.T) {
252252
t.Fatal(err)
253253
}
254254

255-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
255+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")))
256256
if err != nil {
257257
t.Fatal(err)
258258
}
@@ -337,7 +337,7 @@ func TestContainerLargeExecArgs(t *testing.T) {
337337
t.Fatal(err)
338338
}
339339

340-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
340+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")))
341341
if err != nil {
342342
t.Fatal(err)
343343
}
@@ -413,7 +413,7 @@ func TestContainerPids(t *testing.T) {
413413
t.Fatal(err)
414414
}
415415

416-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
416+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")))
417417
if err != nil {
418418
t.Fatal(err)
419419
}
@@ -490,7 +490,7 @@ func TestContainerCloseIO(t *testing.T) {
490490
t.Fatal(err)
491491
}
492492

493-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withCat()), WithNewSnapshot(id, image))
493+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withCat()))
494494
if err != nil {
495495
t.Fatal(err)
496496
}
@@ -546,7 +546,7 @@ func TestDeleteRunningContainer(t *testing.T) {
546546
t.Fatal(err)
547547
}
548548

549-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
549+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")))
550550
if err != nil {
551551
t.Fatal(err)
552552
}
@@ -601,7 +601,7 @@ func TestContainerKill(t *testing.T) {
601601
t.Fatal(err)
602602
}
603603

604-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "10")), WithNewSnapshot(id, image))
604+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "10")))
605605
if err != nil {
606606
t.Fatal(err)
607607
}
@@ -657,8 +657,8 @@ func TestContainerNoBinaryExists(t *testing.T) {
657657
}
658658

659659
container, err := client.NewContainer(ctx, id,
660-
WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("nothing")),
661-
WithNewSnapshot(id, image))
660+
WithNewSnapshot(id, image),
661+
WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("nothing")))
662662
if err != nil {
663663
t.Fatal(err)
664664
}
@@ -703,7 +703,7 @@ func TestContainerExecNoBinaryExists(t *testing.T) {
703703
t.Fatal(err)
704704
}
705705

706-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
706+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")))
707707
if err != nil {
708708
t.Fatal(err)
709709
}
@@ -768,7 +768,7 @@ func TestWaitStoppedTask(t *testing.T) {
768768
t.Fatal(err)
769769
}
770770

771-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withExitStatus(7)), WithNewSnapshot(id, image))
771+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withExitStatus(7)))
772772
if err != nil {
773773
t.Fatal(err)
774774
}
@@ -831,7 +831,7 @@ func TestWaitStoppedProcess(t *testing.T) {
831831
t.Fatal(err)
832832
}
833833

834-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
834+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")))
835835
if err != nil {
836836
t.Fatal(err)
837837
}
@@ -918,7 +918,7 @@ func TestTaskForceDelete(t *testing.T) {
918918
if err != nil {
919919
t.Fatal(err)
920920
}
921-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "30")), WithNewSnapshot(id, image))
921+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "30")))
922922
if err != nil {
923923
t.Fatal(err)
924924
}
@@ -959,7 +959,7 @@ func TestProcessForceDelete(t *testing.T) {
959959
if err != nil {
960960
t.Fatal(err)
961961
}
962-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "30")), WithNewSnapshot(id, image))
962+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "30")))
963963
if err != nil {
964964
t.Fatal(err)
965965
}
@@ -1029,11 +1029,10 @@ func TestContainerHostname(t *testing.T) {
10291029
t.Fatal(err)
10301030
}
10311031

1032-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image),
1032+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image),
10331033
withProcessArgs("hostname"),
10341034
oci.WithHostname(expected),
1035-
),
1036-
WithNewSnapshot(id, image))
1035+
))
10371036
if err != nil {
10381037
t.Fatal(err)
10391038
}
@@ -1098,7 +1097,7 @@ func TestContainerExitedAtSet(t *testing.T) {
10981097
t.Fatal(err)
10991098
}
11001099

1101-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withTrue()), WithNewSnapshot(id, image))
1100+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withTrue()))
11021101
if err != nil {
11031102
t.Fatal(err)
11041103
}
@@ -1158,7 +1157,7 @@ func TestDeleteContainerExecCreated(t *testing.T) {
11581157
t.Fatal(err)
11591158
}
11601159

1161-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")), WithNewSnapshot(id, image))
1160+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("sleep", "100")))
11621161
if err != nil {
11631162
t.Fatal(err)
11641163
}
@@ -1228,8 +1227,8 @@ func TestContainerMetrics(t *testing.T) {
12281227
t.Fatal(err)
12291228
}
12301229
container, err := client.NewContainer(ctx, id,
1231-
WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "30")),
1232-
WithNewSnapshot(id, image))
1230+
WithNewSnapshot(id, image),
1231+
WithNewSpec(oci.WithImageConfig(image), oci.WithProcessArgs("sleep", "30")))
12331232
if err != nil {
12341233
t.Fatal(err)
12351234
}
@@ -1285,9 +1284,8 @@ func TestDeletedContainerMetrics(t *testing.T) {
12851284
t.Fatal(err)
12861285
}
12871286
container, err := client.NewContainer(ctx, id,
1288-
WithNewSpec(oci.WithImageConfig(image), withExitStatus(0)),
12891287
WithNewSnapshot(id, image),
1290-
)
1288+
WithNewSpec(oci.WithImageConfig(image), withExitStatus(0)))
12911289
if err != nil {
12921290
t.Fatal(err)
12931291
}
@@ -1518,7 +1516,7 @@ func TestContainerHook(t *testing.T) {
15181516
}
15191517
return nil
15201518
}
1521-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), hook), WithNewSnapshot(id, image))
1519+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), hook))
15221520
if err != nil {
15231521
t.Fatal(err)
15241522
}

‎daemon_config_linux_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func TestDaemonRuntimeRoot(t *testing.T) {
140140
}
141141

142142
id := t.Name()
143-
container, err := client.NewContainer(ctx, id, WithNewSpec(oci.WithImageConfig(image), withProcessArgs("top")), WithNewSnapshot(id, image), WithRuntime("io.containerd.runc.v1", &options.Options{
143+
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithImageConfig(image), withProcessArgs("top")), WithRuntime("io.containerd.runc.v1", &options.Options{
144144
Root: runtimeRoot,
145145
}))
146146
if err != nil {

0 commit comments

Comments
 (0)