Skip to content

Commit

Permalink
Bumped github.com/kjsanger/extendo from 1.0.0 to 1.1.0
Browse files Browse the repository at this point in the history
Bumped extendo to 1.1.0 and linted the test suite.
  • Loading branch information
Keith James committed Dec 5, 2019
1 parent b759cca commit bdfa6a0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/kjsanger/extendo v1.0.0 h1:nDkGjGMcwc2Cknjc2TrpUV8IEDlILE/25BL6M+XeabM=
github.com/kjsanger/extendo v1.0.0/go.mod h1:NndFVAMbjkN7h/wDYCN0Klpdhjl+lgllUNt9rzygYMg=
github.com/kjsanger/extendo v1.1.0 h1:a0ipKrSjfg+bs6InwbvbHzvoKsxXeicog8A1SN8kg84=
github.com/kjsanger/extendo v1.1.0/go.mod h1:+yIZaVGDr2lzCoEjti+iCg9No52VKA72AdKaJY5u/zs=
github.com/kjsanger/fsnotify v1.4.8-0.20190705153444-45ca73e9793a h1:eEXk79VRqIscsPHonU4g+oCU1KSt1zbJlOjQHU1RgOE=
github.com/kjsanger/fsnotify v1.4.8-0.20190705153444-45ca73e9793a/go.mod h1:4sKo+f997RhF5HZNa2h3t/N7TD7RNcbGzRO7xFpRBYM=
Expand Down
16 changes: 12 additions & 4 deletions valet/valet_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ package valet_test

import (
"context"
"fmt"
"io/ioutil"
"os"
"path/filepath"
Expand Down Expand Up @@ -240,7 +241,7 @@ var _ = Describe("Find files at intervals", func() {

wg.Wait()

for _ = range paths {
for range paths {
// Discard any remaining paths to unblock any sending goroutines
// started by FindFilesInterval (it can have a number running
// because it starts a new one at each interval). This closes the
Expand Down Expand Up @@ -603,6 +604,7 @@ var _ = Describe("IsArchived", func() {
err = obj.AddMetadata([]ex.AVU{{
Attr: "md5",
Value: "999999999912245d785120e3505ed169"}})
Expect(err).NotTo(HaveOccurred())
})

It("is not archived", func() {
Expand Down Expand Up @@ -689,13 +691,17 @@ var _ = Describe("Archive MINKnow files", func() {

BeforeEach(func() {
allDirs, err := findDirsRelative(dataDir)
for i, _ := range allDirs {
Expect(err).NotTo(HaveOccurred())

for i := range allDirs {
allDirs[i], err = filepath.Rel(dataDir, allDirs[i])
Expect(err).NotTo(HaveOccurred())
}

allFiles, err := findFilesRelative(dataDir)
for i, _ := range allFiles {
Expect(err).NotTo(HaveOccurred())

for i := range allFiles {
allFiles[i], err = filepath.Rel(dataDir, allFiles[i])
Expect(err).NotTo(HaveOccurred())
}
Expand Down Expand Up @@ -756,7 +762,9 @@ var _ = Describe("Archive MINKnow files", func() {
return
}
defer func() {
clientPool.Return(client)
if e := clientPool.Return(client); e != nil {
fmt.Fprint(os.Stderr, e.Error())
}
}()

timeout := time.After(120 * time.Second)
Expand Down

0 comments on commit bdfa6a0

Please sign in to comment.