Skip to content

Commit b115dda

Browse files
darkowlzzdarkowlzz
committed
Use filepath instead of path in storage tests
Signed-off-by: Sunny <[email protected]>
1 parent 6134dd9 commit b115dda

File tree

1 file changed

+84
-85
lines changed

1 file changed

+84
-85
lines changed

‎controllers/storage_test.go

Lines changed: 84 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"fmt"
2424
"io"
2525
"os"
26-
"path"
2726
"path/filepath"
2827
"strings"
2928
"testing"
@@ -268,7 +267,7 @@ func TestStorageRemoveAllButCurrent(t *testing.T) {
268267
t.Fatalf("Valid path did not successfully return: %v", err)
269268
}
270269

271-
if _, err := s.RemoveAllButCurrent(sourcev1.Artifact{Path: path.Join(dir, "really", "nonexistent")}); err == nil {
270+
if _, err := s.RemoveAllButCurrent(sourcev1.Artifact{Path: filepath.Join(dir, "really", "nonexistent")}); err == nil {
272271
t.Fatal("Did not error while pruning non-existent path")
273272
}
274273
})
@@ -281,18 +280,18 @@ func TestStorageRemoveAllButCurrent(t *testing.T) {
281280
g.Expect(err).ToNot(HaveOccurred(), "failed to create new storage")
282281

283282
artifact := sourcev1.Artifact{
284-
Path: path.Join("foo", "bar", "artifact1.tar.gz"),
283+
Path: filepath.Join("foo", "bar", "artifact1.tar.gz"),
285284
}
286285

287286
// Create artifact dir and artifacts.
288-
artifactDir := path.Join(dir, "foo", "bar")
287+
artifactDir := filepath.Join(dir, "foo", "bar")
289288
g.Expect(os.MkdirAll(artifactDir, 0o750)).NotTo(HaveOccurred())
290289
current := []string{
291-
path.Join(artifactDir, "artifact1.tar.gz"),
290+
filepath.Join(artifactDir, "artifact1.tar.gz"),
292291
}
293292
wantDeleted := []string{
294-
path.Join(artifactDir, "file1.txt"),
295-
path.Join(artifactDir, "file2.txt"),
293+
filepath.Join(artifactDir, "file1.txt"),
294+
filepath.Join(artifactDir, "file2.txt"),
296295
}
297296
createFile := func(files []string) {
298297
for _, c := range files {
@@ -321,15 +320,15 @@ func TestStorageRemoveAll(t *testing.T) {
321320
}{
322321
{
323322
name: "delete non-existent path",
324-
artifactPath: path.Join("foo", "bar", "artifact1.tar.gz"),
323+
artifactPath: filepath.Join("foo", "bar", "artifact1.tar.gz"),
325324
createArtifactPath: false,
326325
wantDeleted: "",
327326
},
328327
{
329328
name: "delete existing path",
330-
artifactPath: path.Join("foo", "bar", "artifact1.tar.gz"),
329+
artifactPath: filepath.Join("foo", "bar", "artifact1.tar.gz"),
331330
createArtifactPath: true,
332-
wantDeleted: path.Join("foo", "bar"),
331+
wantDeleted: filepath.Join("foo", "bar"),
333332
},
334333
}
335334

@@ -346,7 +345,7 @@ func TestStorageRemoveAll(t *testing.T) {
346345
}
347346

348347
if tt.createArtifactPath {
349-
g.Expect(os.MkdirAll(path.Join(dir, tt.artifactPath), 0o750)).ToNot(HaveOccurred())
348+
g.Expect(os.MkdirAll(filepath.Join(dir, tt.artifactPath), 0o750)).ToNot(HaveOccurred())
350349
}
351350

352351
deleted, err := s.RemoveAll(artifact)
@@ -449,7 +448,7 @@ func TestStorageCopyFromPath(t *testing.T) {
449448
}
450449

451450
func TestStorage_getGarbageFiles(t *testing.T) {
452-
artifactFolder := path.Join("foo", "bar")
451+
artifactFolder := filepath.Join("foo", "bar")
453452
tests := []struct {
454453
name string
455454
artifactPaths []string
@@ -462,119 +461,119 @@ func TestStorage_getGarbageFiles(t *testing.T) {
462461
{
463462
name: "delete files based on maxItemsToBeRetained",
464463
artifactPaths: []string{
465-
path.Join(artifactFolder, "artifact1.tar.gz"),
466-
path.Join(artifactFolder, "artifact2.tar.gz"),
467-
path.Join(artifactFolder, "artifact3.tar.gz"),
468-
path.Join(artifactFolder, "artifact4.tar.gz"),
469-
path.Join(artifactFolder, "artifact5.tar.gz"),
464+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
465+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
466+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
467+
filepath.Join(artifactFolder, "artifact4.tar.gz"),
468+
filepath.Join(artifactFolder, "artifact5.tar.gz"),
470469
},
471470
createPause: time.Millisecond * 10,
472471
ttl: time.Minute * 2,
473472
totalCountLimit: 10,
474473
maxItemsToBeRetained: 2,
475474
wantDeleted: []string{
476-
path.Join(artifactFolder, "artifact1.tar.gz"),
477-
path.Join(artifactFolder, "artifact2.tar.gz"),
478-
path.Join(artifactFolder, "artifact3.tar.gz"),
475+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
476+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
477+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
479478
},
480479
},
481480
{
482481
name: "delete files based on maxItemsToBeRetained, ignore lock files",
483482
artifactPaths: []string{
484-
path.Join(artifactFolder, "artifact1.tar.gz"),
485-
path.Join(artifactFolder, "artifact1.tar.gz.lock"),
486-
path.Join(artifactFolder, "artifact2.tar.gz"),
487-
path.Join(artifactFolder, "artifact2.tar.gz.lock"),
488-
path.Join(artifactFolder, "artifact3.tar.gz"),
489-
path.Join(artifactFolder, "artifact3.tar.gz.lock"),
490-
path.Join(artifactFolder, "artifact4.tar.gz"),
491-
path.Join(artifactFolder, "artifact5.tar.gz"),
483+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
484+
filepath.Join(artifactFolder, "artifact1.tar.gz.lock"),
485+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
486+
filepath.Join(artifactFolder, "artifact2.tar.gz.lock"),
487+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
488+
filepath.Join(artifactFolder, "artifact3.tar.gz.lock"),
489+
filepath.Join(artifactFolder, "artifact4.tar.gz"),
490+
filepath.Join(artifactFolder, "artifact5.tar.gz"),
492491
},
493492
createPause: time.Millisecond * 10,
494493
ttl: time.Minute * 2,
495494
totalCountLimit: 10,
496495
maxItemsToBeRetained: 2,
497496
wantDeleted: []string{
498-
path.Join(artifactFolder, "artifact1.tar.gz"),
499-
path.Join(artifactFolder, "artifact2.tar.gz"),
500-
path.Join(artifactFolder, "artifact3.tar.gz"),
497+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
498+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
499+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
501500
},
502501
},
503502
{
504503
name: "delete files based on ttl",
505504
artifactPaths: []string{
506-
path.Join(artifactFolder, "artifact1.tar.gz"),
507-
path.Join(artifactFolder, "artifact2.tar.gz"),
508-
path.Join(artifactFolder, "artifact3.tar.gz"),
509-
path.Join(artifactFolder, "artifact4.tar.gz"),
510-
path.Join(artifactFolder, "artifact5.tar.gz"),
505+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
506+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
507+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
508+
filepath.Join(artifactFolder, "artifact4.tar.gz"),
509+
filepath.Join(artifactFolder, "artifact5.tar.gz"),
511510
},
512511
createPause: time.Second * 1,
513512
ttl: time.Second*3 + time.Millisecond*500,
514513
totalCountLimit: 10,
515514
maxItemsToBeRetained: 4,
516515
wantDeleted: []string{
517-
path.Join(artifactFolder, "artifact1.tar.gz"),
518-
path.Join(artifactFolder, "artifact2.tar.gz"),
516+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
517+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
519518
},
520519
},
521520
{
522521
name: "delete files based on ttl, ignore lock files",
523522
artifactPaths: []string{
524-
path.Join(artifactFolder, "artifact1.tar.gz"),
525-
path.Join(artifactFolder, "artifact1.tar.gz.lock"),
526-
path.Join(artifactFolder, "artifact2.tar.gz"),
527-
path.Join(artifactFolder, "artifact2.tar.gz.lock"),
528-
path.Join(artifactFolder, "artifact3.tar.gz"),
529-
path.Join(artifactFolder, "artifact4.tar.gz"),
530-
path.Join(artifactFolder, "artifact5.tar.gz"),
523+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
524+
filepath.Join(artifactFolder, "artifact1.tar.gz.lock"),
525+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
526+
filepath.Join(artifactFolder, "artifact2.tar.gz.lock"),
527+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
528+
filepath.Join(artifactFolder, "artifact4.tar.gz"),
529+
filepath.Join(artifactFolder, "artifact5.tar.gz"),
531530
},
532531
createPause: time.Second * 1,
533532
ttl: time.Second*3 + time.Millisecond*500,
534533
totalCountLimit: 10,
535534
maxItemsToBeRetained: 4,
536535
wantDeleted: []string{
537-
path.Join(artifactFolder, "artifact1.tar.gz"),
538-
path.Join(artifactFolder, "artifact2.tar.gz"),
536+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
537+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
539538
},
540539
},
541540
{
542541
name: "delete files based on ttl and maxItemsToBeRetained",
543542
artifactPaths: []string{
544-
path.Join(artifactFolder, "artifact1.tar.gz"),
545-
path.Join(artifactFolder, "artifact2.tar.gz"),
546-
path.Join(artifactFolder, "artifact3.tar.gz"),
547-
path.Join(artifactFolder, "artifact4.tar.gz"),
548-
path.Join(artifactFolder, "artifact5.tar.gz"),
549-
path.Join(artifactFolder, "artifact6.tar.gz"),
543+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
544+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
545+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
546+
filepath.Join(artifactFolder, "artifact4.tar.gz"),
547+
filepath.Join(artifactFolder, "artifact5.tar.gz"),
548+
filepath.Join(artifactFolder, "artifact6.tar.gz"),
550549
},
551550
createPause: time.Second * 1,
552551
ttl: time.Second*5 + time.Millisecond*500,
553552
totalCountLimit: 10,
554553
maxItemsToBeRetained: 4,
555554
wantDeleted: []string{
556-
path.Join(artifactFolder, "artifact1.tar.gz"),
557-
path.Join(artifactFolder, "artifact2.tar.gz"),
555+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
556+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
558557
},
559558
},
560559
{
561560
name: "delete files based on ttl and maxItemsToBeRetained and totalCountLimit",
562561
artifactPaths: []string{
563-
path.Join(artifactFolder, "artifact1.tar.gz"),
564-
path.Join(artifactFolder, "artifact2.tar.gz"),
565-
path.Join(artifactFolder, "artifact3.tar.gz"),
566-
path.Join(artifactFolder, "artifact4.tar.gz"),
567-
path.Join(artifactFolder, "artifact5.tar.gz"),
568-
path.Join(artifactFolder, "artifact6.tar.gz"),
562+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
563+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
564+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
565+
filepath.Join(artifactFolder, "artifact4.tar.gz"),
566+
filepath.Join(artifactFolder, "artifact5.tar.gz"),
567+
filepath.Join(artifactFolder, "artifact6.tar.gz"),
569568
},
570569
createPause: time.Millisecond * 500,
571570
ttl: time.Millisecond * 500,
572571
totalCountLimit: 3,
573572
maxItemsToBeRetained: 2,
574573
wantDeleted: []string{
575-
path.Join(artifactFolder, "artifact1.tar.gz"),
576-
path.Join(artifactFolder, "artifact2.tar.gz"),
577-
path.Join(artifactFolder, "artifact3.tar.gz"),
574+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
575+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
576+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
578577
},
579578
},
580579
}
@@ -590,9 +589,9 @@ func TestStorage_getGarbageFiles(t *testing.T) {
590589
artifact := sourcev1.Artifact{
591590
Path: tt.artifactPaths[len(tt.artifactPaths)-1],
592591
}
593-
g.Expect(os.MkdirAll(path.Join(dir, artifactFolder), 0o750)).ToNot(HaveOccurred())
592+
g.Expect(os.MkdirAll(filepath.Join(dir, artifactFolder), 0o750)).ToNot(HaveOccurred())
594593
for _, artifactPath := range tt.artifactPaths {
595-
f, err := os.Create(path.Join(dir, artifactPath))
594+
f, err := os.Create(filepath.Join(dir, artifactPath))
596595
g.Expect(err).ToNot(HaveOccurred())
597596
g.Expect(f.Close()).ToNot(HaveOccurred())
598597
time.Sleep(tt.createPause)
@@ -618,7 +617,7 @@ func TestStorage_getGarbageFiles(t *testing.T) {
618617
}
619618

620619
func TestStorage_GarbageCollect(t *testing.T) {
621-
artifactFolder := path.Join("foo", "bar")
620+
artifactFolder := filepath.Join("foo", "bar")
622621
tests := []struct {
623622
name string
624623
artifactPaths []string
@@ -630,32 +629,32 @@ func TestStorage_GarbageCollect(t *testing.T) {
630629
{
631630
name: "garbage collects",
632631
artifactPaths: []string{
633-
path.Join(artifactFolder, "artifact1.tar.gz"),
634-
path.Join(artifactFolder, "artifact1.tar.gz.lock"),
635-
path.Join(artifactFolder, "artifact2.tar.gz"),
636-
path.Join(artifactFolder, "artifact2.tar.gz.lock"),
637-
path.Join(artifactFolder, "artifact3.tar.gz"),
638-
path.Join(artifactFolder, "artifact4.tar.gz"),
632+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
633+
filepath.Join(artifactFolder, "artifact1.tar.gz.lock"),
634+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
635+
filepath.Join(artifactFolder, "artifact2.tar.gz.lock"),
636+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
637+
filepath.Join(artifactFolder, "artifact4.tar.gz"),
639638
},
640639
wantCollected: []string{
641-
path.Join(artifactFolder, "artifact1.tar.gz"),
642-
path.Join(artifactFolder, "artifact2.tar.gz"),
640+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
641+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
643642
},
644643
wantDeleted: []string{
645-
path.Join(artifactFolder, "artifact1.tar.gz"),
646-
path.Join(artifactFolder, "artifact1.tar.gz.lock"),
647-
path.Join(artifactFolder, "artifact2.tar.gz"),
648-
path.Join(artifactFolder, "artifact2.tar.gz.lock"),
644+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
645+
filepath.Join(artifactFolder, "artifact1.tar.gz.lock"),
646+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
647+
filepath.Join(artifactFolder, "artifact2.tar.gz.lock"),
649648
},
650649
ctxTimeout: time.Second * 1,
651650
},
652651
{
653652
name: "garbage collection fails with context timeout",
654653
artifactPaths: []string{
655-
path.Join(artifactFolder, "artifact1.tar.gz"),
656-
path.Join(artifactFolder, "artifact2.tar.gz"),
657-
path.Join(artifactFolder, "artifact3.tar.gz"),
658-
path.Join(artifactFolder, "artifact4.tar.gz"),
654+
filepath.Join(artifactFolder, "artifact1.tar.gz"),
655+
filepath.Join(artifactFolder, "artifact2.tar.gz"),
656+
filepath.Join(artifactFolder, "artifact3.tar.gz"),
657+
filepath.Join(artifactFolder, "artifact4.tar.gz"),
659658
},
660659
wantErr: "context deadline exceeded",
661660
ctxTimeout: time.Nanosecond * 1,
@@ -673,9 +672,9 @@ func TestStorage_GarbageCollect(t *testing.T) {
673672
artifact := sourcev1.Artifact{
674673
Path: tt.artifactPaths[len(tt.artifactPaths)-1],
675674
}
676-
g.Expect(os.MkdirAll(path.Join(dir, artifactFolder), 0o750)).ToNot(HaveOccurred())
675+
g.Expect(os.MkdirAll(filepath.Join(dir, artifactFolder), 0o750)).ToNot(HaveOccurred())
677676
for i, artifactPath := range tt.artifactPaths {
678-
f, err := os.Create(path.Join(dir, artifactPath))
677+
f, err := os.Create(filepath.Join(dir, artifactPath))
679678
g.Expect(err).ToNot(HaveOccurred())
680679
g.Expect(f.Close()).ToNot(HaveOccurred())
681680
if i != len(tt.artifactPaths)-1 {

0 commit comments

Comments
 (0)