1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
|
From: Shengjing Zhu <zhsj@debian.org>
Date: Sat, 20 Aug 2022 21:08:06 +0800
Subject: Downgrade to ginkgo v1
Forwarded: not-needed
---
libcni/api_test.go | 2 +-
libcni/backwards_compatibility_test.go | 2 +-
libcni/conf_test.go | 2 +-
libcni/libcni_suite_test.go | 2 +-
pkg/invoke/args_test.go | 2 +-
pkg/invoke/delegate_test.go | 2 +-
pkg/invoke/exec_test.go | 2 +-
pkg/invoke/find_test.go | 2 +-
pkg/invoke/get_version_integration_test.go | 3 ++-
pkg/invoke/invoke_suite_test.go | 2 +-
pkg/invoke/raw_exec_test.go | 2 +-
pkg/skel/skel_suite_test.go | 2 +-
pkg/skel/skel_test.go | 3 ++-
pkg/types/020/types_suite_test.go | 2 +-
pkg/types/020/types_test.go | 2 +-
pkg/types/040/types_suite_test.go | 2 +-
pkg/types/040/types_test.go | 2 +-
pkg/types/100/types_suite_test.go | 2 +-
pkg/types/100/types_test.go | 2 +-
pkg/types/args_test.go | 3 ++-
pkg/types/types_suite_test.go | 2 +-
pkg/types/types_test.go | 3 ++-
pkg/version/conf_test.go | 2 +-
pkg/version/legacy_examples/legacy_examples_suite_test.go | 2 +-
pkg/version/legacy_examples/legacy_examples_test.go | 2 +-
pkg/version/plugin_test.go | 2 +-
pkg/version/reconcile_test.go | 2 +-
pkg/version/testhelpers/testhelpers_suite_test.go | 2 +-
pkg/version/testhelpers/testhelpers_test.go | 2 +-
pkg/version/version_suite_test.go | 2 +-
pkg/version/version_test.go | 2 +-
plugins/test/noop/noop_suite_test.go | 2 +-
plugins/test/noop/noop_test.go | 2 +-
33 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/libcni/api_test.go b/libcni/api_test.go
index 621e12e..430ed2b 100644
--- a/libcni/api_test.go
+++ b/libcni/api_test.go
@@ -34,7 +34,7 @@ import (
current "github.com/containernetworking/cni/pkg/types/100"
noop_debug "github.com/containernetworking/cni/plugins/test/noop/debug"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/libcni/backwards_compatibility_test.go b/libcni/backwards_compatibility_test.go
index 2aad65c..d09d3b6 100644
--- a/libcni/backwards_compatibility_test.go
+++ b/libcni/backwards_compatibility_test.go
@@ -28,7 +28,7 @@ import (
"github.com/containernetworking/cni/libcni"
"github.com/containernetworking/cni/pkg/version/legacy_examples"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
)
diff --git a/libcni/conf_test.go b/libcni/conf_test.go
index e94a036..e645829 100644
--- a/libcni/conf_test.go
+++ b/libcni/conf_test.go
@@ -21,7 +21,7 @@ import (
"github.com/containernetworking/cni/libcni"
"github.com/containernetworking/cni/pkg/types"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/libcni/libcni_suite_test.go b/libcni/libcni_suite_test.go
index 4201bec..6412215 100644
--- a/libcni/libcni_suite_test.go
+++ b/libcni/libcni_suite_test.go
@@ -18,7 +18,7 @@ import (
"encoding/json"
"path/filepath"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
diff --git a/pkg/invoke/args_test.go b/pkg/invoke/args_test.go
index cd8155c..87854eb 100644
--- a/pkg/invoke/args_test.go
+++ b/pkg/invoke/args_test.go
@@ -19,7 +19,7 @@ import (
"github.com/containernetworking/cni/pkg/invoke"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/invoke/delegate_test.go b/pkg/invoke/delegate_test.go
index 44fd6d8..75f92bc 100644
--- a/pkg/invoke/delegate_test.go
+++ b/pkg/invoke/delegate_test.go
@@ -26,7 +26,7 @@ import (
current "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/cni/plugins/test/noop/debug"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/invoke/exec_test.go b/pkg/invoke/exec_test.go
index 634f479..dc8e536 100644
--- a/pkg/invoke/exec_test.go
+++ b/pkg/invoke/exec_test.go
@@ -24,7 +24,7 @@ import (
current "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/cni/pkg/version"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/invoke/find_test.go b/pkg/invoke/find_test.go
index e10b5dd..dfa7440 100644
--- a/pkg/invoke/find_test.go
+++ b/pkg/invoke/find_test.go
@@ -22,7 +22,7 @@ import (
"strings"
"github.com/containernetworking/cni/pkg/invoke"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/invoke/get_version_integration_test.go b/pkg/invoke/get_version_integration_test.go
index f002ff7..754b4d6 100644
--- a/pkg/invoke/get_version_integration_test.go
+++ b/pkg/invoke/get_version_integration_test.go
@@ -27,7 +27,8 @@ import (
"github.com/containernetworking/cni/pkg/version"
"github.com/containernetworking/cni/pkg/version/testhelpers"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
+ . "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
)
diff --git a/pkg/invoke/invoke_suite_test.go b/pkg/invoke/invoke_suite_test.go
index afec055..7285878 100644
--- a/pkg/invoke/invoke_suite_test.go
+++ b/pkg/invoke/invoke_suite_test.go
@@ -15,7 +15,7 @@
package invoke_test
import (
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
diff --git a/pkg/invoke/raw_exec_test.go b/pkg/invoke/raw_exec_test.go
index 06bab75..3b8b4dc 100644
--- a/pkg/invoke/raw_exec_test.go
+++ b/pkg/invoke/raw_exec_test.go
@@ -24,7 +24,7 @@ import (
noop_debug "github.com/containernetworking/cni/plugins/test/noop/debug"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/skel/skel_suite_test.go b/pkg/skel/skel_suite_test.go
index a9b758b..df5a8e7 100644
--- a/pkg/skel/skel_suite_test.go
+++ b/pkg/skel/skel_suite_test.go
@@ -15,7 +15,7 @@
package skel
import (
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"testing"
diff --git a/pkg/skel/skel_test.go b/pkg/skel/skel_test.go
index dc269df..f65a2a5 100644
--- a/pkg/skel/skel_test.go
+++ b/pkg/skel/skel_test.go
@@ -24,7 +24,8 @@ import (
current "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/cni/pkg/version"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
+ . "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
)
diff --git a/pkg/types/020/types_suite_test.go b/pkg/types/020/types_suite_test.go
index f8a7b93..095d73e 100644
--- a/pkg/types/020/types_suite_test.go
+++ b/pkg/types/020/types_suite_test.go
@@ -15,7 +15,7 @@
package types020_test
import (
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"testing"
diff --git a/pkg/types/020/types_test.go b/pkg/types/020/types_test.go
index 80a6ea8..48f7e8f 100644
--- a/pkg/types/020/types_test.go
+++ b/pkg/types/020/types_test.go
@@ -23,7 +23,7 @@ import (
"github.com/containernetworking/cni/pkg/types/020"
"github.com/containernetworking/cni/pkg/types/create"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/types/040/types_suite_test.go b/pkg/types/040/types_suite_test.go
index ab88370..4bcb0fa 100644
--- a/pkg/types/040/types_suite_test.go
+++ b/pkg/types/040/types_suite_test.go
@@ -15,7 +15,7 @@
package types040_test
import (
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"testing"
diff --git a/pkg/types/040/types_test.go b/pkg/types/040/types_test.go
index 984361f..f30372b 100644
--- a/pkg/types/040/types_test.go
+++ b/pkg/types/040/types_test.go
@@ -24,7 +24,7 @@ import (
types020 "github.com/containernetworking/cni/pkg/types/020"
types040 "github.com/containernetworking/cni/pkg/types/040"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/types/100/types_suite_test.go b/pkg/types/100/types_suite_test.go
index d741755..fd55a91 100644
--- a/pkg/types/100/types_suite_test.go
+++ b/pkg/types/100/types_suite_test.go
@@ -15,7 +15,7 @@
package types100_test
import (
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"testing"
diff --git a/pkg/types/100/types_test.go b/pkg/types/100/types_test.go
index e96d10b..2f38677 100644
--- a/pkg/types/100/types_test.go
+++ b/pkg/types/100/types_test.go
@@ -23,7 +23,7 @@ import (
"github.com/containernetworking/cni/pkg/types"
current "github.com/containernetworking/cni/pkg/types/100"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/types/args_test.go b/pkg/types/args_test.go
index 6c35040..20c8c04 100644
--- a/pkg/types/args_test.go
+++ b/pkg/types/args_test.go
@@ -20,7 +20,8 @@ import (
. "github.com/containernetworking/cni/pkg/types"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
+ . "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
)
diff --git a/pkg/types/types_suite_test.go b/pkg/types/types_suite_test.go
index 679d8a0..2b178ce 100644
--- a/pkg/types/types_suite_test.go
+++ b/pkg/types/types_suite_test.go
@@ -15,7 +15,7 @@
package types_test
import (
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"testing"
diff --git a/pkg/types/types_test.go b/pkg/types/types_test.go
index 899cd8e..2fb46b4 100644
--- a/pkg/types/types_test.go
+++ b/pkg/types/types_test.go
@@ -20,7 +20,8 @@ import (
"github.com/containernetworking/cni/pkg/types"
current "github.com/containernetworking/cni/pkg/types/100"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
+ . "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
)
diff --git a/pkg/version/conf_test.go b/pkg/version/conf_test.go
index 04702d9..2d8d62e 100644
--- a/pkg/version/conf_test.go
+++ b/pkg/version/conf_test.go
@@ -17,7 +17,7 @@ package version_test
import (
"github.com/containernetworking/cni/pkg/version"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/version/legacy_examples/legacy_examples_suite_test.go b/pkg/version/legacy_examples/legacy_examples_suite_test.go
index 6870e83..a126531 100644
--- a/pkg/version/legacy_examples/legacy_examples_suite_test.go
+++ b/pkg/version/legacy_examples/legacy_examples_suite_test.go
@@ -15,7 +15,7 @@
package legacy_examples_test
import (
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"testing"
diff --git a/pkg/version/legacy_examples/legacy_examples_test.go b/pkg/version/legacy_examples/legacy_examples_test.go
index d6146ca..3490eda 100644
--- a/pkg/version/legacy_examples/legacy_examples_test.go
+++ b/pkg/version/legacy_examples/legacy_examples_test.go
@@ -20,7 +20,7 @@ import (
"runtime"
"github.com/containernetworking/cni/pkg/version/legacy_examples"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/version/plugin_test.go b/pkg/version/plugin_test.go
index 99bf6ca..a0edd39 100644
--- a/pkg/version/plugin_test.go
+++ b/pkg/version/plugin_test.go
@@ -16,7 +16,7 @@ package version_test
import (
"github.com/containernetworking/cni/pkg/version"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/version/reconcile_test.go b/pkg/version/reconcile_test.go
index 00c7dd0..0c964ce 100644
--- a/pkg/version/reconcile_test.go
+++ b/pkg/version/reconcile_test.go
@@ -16,7 +16,7 @@ package version_test
import (
"github.com/containernetworking/cni/pkg/version"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/version/testhelpers/testhelpers_suite_test.go b/pkg/version/testhelpers/testhelpers_suite_test.go
index 9766d5f..72f65f9 100644
--- a/pkg/version/testhelpers/testhelpers_suite_test.go
+++ b/pkg/version/testhelpers/testhelpers_suite_test.go
@@ -15,7 +15,7 @@
package testhelpers_test
import (
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"testing"
diff --git a/pkg/version/testhelpers/testhelpers_test.go b/pkg/version/testhelpers/testhelpers_test.go
index b57ebe8..3a19d62 100644
--- a/pkg/version/testhelpers/testhelpers_test.go
+++ b/pkg/version/testhelpers/testhelpers_test.go
@@ -20,7 +20,7 @@ import (
"path/filepath"
"runtime"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/pkg/version/version_suite_test.go b/pkg/version/version_suite_test.go
index e3a3511..25d503c 100644
--- a/pkg/version/version_suite_test.go
+++ b/pkg/version/version_suite_test.go
@@ -15,7 +15,7 @@
package version_test
import (
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"testing"
diff --git a/pkg/version/version_test.go b/pkg/version/version_test.go
index 19b0fee..c273dfb 100644
--- a/pkg/version/version_test.go
+++ b/pkg/version/version_test.go
@@ -23,7 +23,7 @@ import (
current "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/cni/pkg/version"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
diff --git a/plugins/test/noop/noop_suite_test.go b/plugins/test/noop/noop_suite_test.go
index 62d7db6..7d2cb32 100644
--- a/plugins/test/noop/noop_suite_test.go
+++ b/plugins/test/noop/noop_suite_test.go
@@ -15,7 +15,7 @@
package main_test
import (
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
diff --git a/plugins/test/noop/noop_test.go b/plugins/test/noop/noop_test.go
index b1c4c92..546f4d3 100644
--- a/plugins/test/noop/noop_test.go
+++ b/plugins/test/noop/noop_test.go
@@ -25,7 +25,7 @@ import (
"github.com/containernetworking/cni/pkg/types"
"github.com/containernetworking/cni/pkg/version"
noop_debug "github.com/containernetworking/cni/plugins/test/noop/debug"
- . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
)
|
