Fix lint errors

This commit is contained in:
Deluan
2020-07-12 13:36:22 -04:00
parent 064da8e034
commit ee0ae0a06c
+10 -9
View File
@@ -1,6 +1,7 @@
package scanner package scanner
import ( import (
"context"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@@ -27,7 +28,7 @@ var _ = Describe("ChangeDetector", func() {
It("detects changes recursively", func() { It("detects changes recursively", func() {
// Scan empty folder // Scan empty folder
changed, deleted, err := scanner.Scan(nil, lastModifiedSince) changed, deleted, err := scanner.Scan(context.TODO(), lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(".")) Expect(changed).To(ConsistOf("."))
@@ -38,7 +39,7 @@ var _ = Describe("ChangeDetector", func() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
changed, deleted, err = scanner.Scan(nil, lastModifiedSince) changed, deleted, err = scanner.Scan(context.TODO(), lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(".", P("a"))) Expect(changed).To(ConsistOf(".", P("a")))
@@ -49,14 +50,14 @@ var _ = Describe("ChangeDetector", func() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
changed, deleted, err = scanner.Scan(nil, lastModifiedSince) changed, deleted, err = scanner.Scan(context.TODO(), lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(P("a"), P("a/b"), P("a/b/c"))) Expect(changed).To(ConsistOf(P("a"), P("a/b"), P("a/b/c")))
// Scan with no changes // Scan with no changes
lastModifiedSince = nowWithDelay() lastModifiedSince = nowWithDelay()
changed, deleted, err = scanner.Scan(nil, lastModifiedSince) changed, deleted, err = scanner.Scan(context.TODO(), lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(BeEmpty()) Expect(changed).To(BeEmpty())
@@ -67,7 +68,7 @@ var _ = Describe("ChangeDetector", func() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
changed, deleted, err = scanner.Scan(nil, lastModifiedSince) changed, deleted, err = scanner.Scan(context.TODO(), lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(P("a/b"))) Expect(changed).To(ConsistOf(P("a/b")))
@@ -78,7 +79,7 @@ var _ = Describe("ChangeDetector", func() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
changed, deleted, err = scanner.Scan(nil, lastModifiedSince) changed, deleted, err = scanner.Scan(context.TODO(), lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(P("a/b"))) Expect(changed).To(ConsistOf(P("a/b")))
@@ -89,7 +90,7 @@ var _ = Describe("ChangeDetector", func() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
changed, deleted, err = scanner.Scan(nil, lastModifiedSince) changed, deleted, err = scanner.Scan(context.TODO(), lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(ConsistOf(P("a/b/c"))) Expect(deleted).To(ConsistOf(P("a/b/c")))
Expect(changed).To(ConsistOf(P("a/b"))) Expect(changed).To(ConsistOf(P("a/b")))
@@ -97,7 +98,7 @@ var _ = Describe("ChangeDetector", func() {
// Only returns changes after lastModifiedSince // Only returns changes after lastModifiedSince
lastModifiedSince = nowWithDelay() lastModifiedSince = nowWithDelay()
newScanner := NewChangeDetector(testFolder) newScanner := NewChangeDetector(testFolder)
changed, deleted, err = newScanner.Scan(nil, lastModifiedSince) changed, deleted, err = newScanner.Scan(context.TODO(), lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(BeEmpty()) Expect(changed).To(BeEmpty())
@@ -105,7 +106,7 @@ var _ = Describe("ChangeDetector", func() {
f, _ := os.Create(filepath.Join(testFolder, "a", "b", "new.txt")) f, _ := os.Create(filepath.Join(testFolder, "a", "b", "new.txt"))
_ = f.Close() _ = f.Close()
changed, deleted, err = newScanner.Scan(nil, lastModifiedSince) changed, deleted, err = newScanner.Scan(context.TODO(), lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(P("a/b"))) Expect(changed).To(ConsistOf(P("a/b")))