diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-08-11 13:40:16 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2018-08-11 13:40:16 +0200 |
commit | 6279b0219e92fcaf24193b7869472915a5e1b544 (patch) | |
tree | 5752c7f0f8e267e01ea65beeeb6132dcb2eb5e97 | |
parent | 2854a63758779bdc647fc6e5b286af20edb9fe8a (diff) |
Simplify
-rw-r--r-- | lftp/client_test.go | 6 | ||||
-rw-r--r-- | queue/queue_test.go | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/lftp/client_test.go b/lftp/client_test.go index 249f7ca..dad27d5 100644 --- a/lftp/client_test.go +++ b/lftp/client_test.go @@ -12,9 +12,9 @@ func TestParseDirList(t *testing.T) { 1422918075 dir2/ 1426408110 dir3@` want := []file{ - file{modTime: time.Date(2014, 6, 25, 14, 15, 16, 0, time.UTC), path: "dir1"}, - file{modTime: time.Date(2015, 2, 2, 23, 1, 15, 0, time.UTC), path: "dir2"}, - file{modTime: time.Date(2015, 3, 15, 8, 28, 30, 0, time.UTC), path: "dir3"}, + {modTime: time.Date(2014, 6, 25, 14, 15, 16, 0, time.UTC), path: "dir1"}, + {modTime: time.Date(2015, 2, 2, 23, 1, 15, 0, time.UTC), path: "dir2"}, + {modTime: time.Date(2015, 3, 15, 8, 28, 30, 0, time.UTC), path: "dir3"}, } got, err := parseDirList(strings.NewReader(ls)) if err != nil { diff --git a/queue/queue_test.go b/queue/queue_test.go index 13d6fdb..ba0df5b 100644 --- a/queue/queue_test.go +++ b/queue/queue_test.go @@ -117,14 +117,14 @@ func TestNewQueue(t *testing.T) { } q := newQueue(s, files, readDir) expected := []Item{ - Item{itemParser: q.itemParser, RemotePath: files[0].Name(), Transfer: false, Reason: "IsSymlink=true SkipSymlinks=true"}, - Item{itemParser: q.itemParser, RemotePath: files[1].Name(), Transfer: false, Reason: "Age=48h0m0s MaxAge=24h0m0s"}, - Item{itemParser: q.itemParser, RemotePath: files[2].Name(), Transfer: true, Reason: "Match=dir\\d"}, - Item{itemParser: q.itemParser, RemotePath: files[3].Name(), Transfer: true, Reason: "Match=dir\\d"}, - Item{itemParser: q.itemParser, RemotePath: files[4].Name(), Transfer: false, Reason: "IsDstDirEmpty=false"}, - Item{itemParser: q.itemParser, RemotePath: files[5].Name(), Transfer: false, Reason: "no match"}, - Item{itemParser: q.itemParser, RemotePath: files[6].Name(), Transfer: false, Reason: "Filter=^incomplete-"}, - Item{itemParser: q.itemParser, RemotePath: files[7].Name(), Transfer: false, Reason: "IsFile=true SkipFiles=true"}, + {itemParser: q.itemParser, RemotePath: files[0].Name(), Transfer: false, Reason: "IsSymlink=true SkipSymlinks=true"}, + {itemParser: q.itemParser, RemotePath: files[1].Name(), Transfer: false, Reason: "Age=48h0m0s MaxAge=24h0m0s"}, + {itemParser: q.itemParser, RemotePath: files[2].Name(), Transfer: true, Reason: "Match=dir\\d"}, + {itemParser: q.itemParser, RemotePath: files[3].Name(), Transfer: true, Reason: "Match=dir\\d"}, + {itemParser: q.itemParser, RemotePath: files[4].Name(), Transfer: false, Reason: "IsDstDirEmpty=false"}, + {itemParser: q.itemParser, RemotePath: files[5].Name(), Transfer: false, Reason: "no match"}, + {itemParser: q.itemParser, RemotePath: files[6].Name(), Transfer: false, Reason: "Filter=^incomplete-"}, + {itemParser: q.itemParser, RemotePath: files[7].Name(), Transfer: false, Reason: "IsFile=true SkipFiles=true"}, } actual := q.Items if len(expected) != len(actual) { @@ -361,8 +361,8 @@ func TestMarshalText(t *testing.T) { Name: "siteA", } items := []Item{ - Item{RemotePath: "/remote/foo", LocalPath: "/local", Transfer: true}, - Item{RemotePath: "/remote/bar", LocalPath: "/local", Transfer: true}, + {RemotePath: "/remote/foo", LocalPath: "/local", Transfer: true}, + {RemotePath: "/remote/bar", LocalPath: "/local", Transfer: true}, } var q encoding.TextMarshaler = Queue{Site: s, Items: items} out, err := q.MarshalText() |