Skip to content

Commit eace420

Browse files
puellanivispuellanivis
authored
Merge branch 'master' into patch/RequestServer-Serve-bugs
2 parents c276d4b + f129610 commit eace420

File tree

4 files changed

+42
-38
lines changed

4 files changed

+42
-38
lines changed

‎go.mod

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
module github.com/pkg/sftp
22

3-
go 1.12
3+
go 1.13
44

55
require (
6+
github.com/davecgh/go-spew v1.1.1 // indirect
67
github.com/kr/fs v0.1.0
7-
github.com/pkg/errors v0.8.1
8-
github.com/stretchr/testify v1.4.0
9-
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
8+
github.com/pkg/errors v0.9.1
9+
github.com/stretchr/testify v1.6.1
10+
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
11+
golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6 // indirect
12+
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
1013
)

‎go.sum

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
21
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
34
github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
45
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
5-
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
6-
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
6+
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
7+
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
78
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
89
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
910
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
10-
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
11-
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
11+
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
12+
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1213
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
13-
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw=
14-
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
14+
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg=
15+
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
1516
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
1617
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
17-
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
1818
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
19+
golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1920
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
20-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2121
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
22-
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
23-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
22+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
23+
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
24+
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎packet-manager_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,34 +53,34 @@ type orderedPair struct {
5353

5454
// basic test
5555
var ttable1 = []pair{
56-
pair{fake(0, 0), fake(0, 0)},
57-
pair{fake(1, 1), fake(1, 1)},
58-
pair{fake(2, 2), fake(2, 2)},
59-
pair{fake(3, 3), fake(3, 3)},
56+
{fake(0, 0), fake(0, 0)},
57+
{fake(1, 1), fake(1, 1)},
58+
{fake(2, 2), fake(2, 2)},
59+
{fake(3, 3), fake(3, 3)},
6060
}
6161

6262
// outgoing packets out of order
6363
var ttable2 = []pair{
64-
pair{fake(10, 0), fake(12, 2)},
65-
pair{fake(11, 1), fake(11, 1)},
66-
pair{fake(12, 2), fake(13, 3)},
67-
pair{fake(13, 3), fake(10, 0)},
64+
{fake(10, 0), fake(12, 2)},
65+
{fake(11, 1), fake(11, 1)},
66+
{fake(12, 2), fake(13, 3)},
67+
{fake(13, 3), fake(10, 0)},
6868
}
6969

7070
// request ids are not incremental
7171
var ttable3 = []pair{
72-
pair{fake(7, 0), fake(7, 0)},
73-
pair{fake(1, 1), fake(1, 1)},
74-
pair{fake(9, 2), fake(3, 3)},
75-
pair{fake(3, 3), fake(9, 2)},
72+
{fake(7, 0), fake(7, 0)},
73+
{fake(1, 1), fake(1, 1)},
74+
{fake(9, 2), fake(3, 3)},
75+
{fake(3, 3), fake(9, 2)},
7676
}
7777

7878
// request ids are all the same
7979
var ttable4 = []pair{
80-
pair{fake(1, 0), fake(1, 0)},
81-
pair{fake(1, 1), fake(1, 1)},
82-
pair{fake(1, 2), fake(1, 3)},
83-
pair{fake(1, 3), fake(1, 2)},
80+
{fake(1, 0), fake(1, 0)},
81+
{fake(1, 1), fake(1, 1)},
82+
{fake(1, 2), fake(1, 3)},
83+
{fake(1, 3), fake(1, 2)},
8484
}
8585

8686
var tables = [][]pair{ttable1, ttable2, ttable3, ttable4}

‎server_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,14 @@ func TestStatusFromError(t *testing.T) {
281281
}
282282
}
283283
testCases := []test{
284-
test{syscall.ENOENT, tpkt(1, sshFxNoSuchFile)},
285-
test{&os.PathError{Err: syscall.ENOENT},
284+
{syscall.ENOENT, tpkt(1, sshFxNoSuchFile)},
285+
{&os.PathError{Err: syscall.ENOENT},
286286
tpkt(2, sshFxNoSuchFile)},
287-
test{&os.PathError{Err: errors.New("foo")}, tpkt(3, sshFxFailure)},
288-
test{ErrSSHFxEOF, tpkt(4, sshFxEOF)},
289-
test{ErrSSHFxOpUnsupported, tpkt(5, sshFxOPUnsupported)},
290-
test{io.EOF, tpkt(6, sshFxEOF)},
291-
test{os.ErrNotExist, tpkt(7, sshFxNoSuchFile)},
287+
{&os.PathError{Err: errors.New("foo")}, tpkt(3, sshFxFailure)},
288+
{ErrSSHFxEOF, tpkt(4, sshFxEOF)},
289+
{ErrSSHFxOpUnsupported, tpkt(5, sshFxOPUnsupported)},
290+
{io.EOF, tpkt(6, sshFxEOF)},
291+
{os.ErrNotExist, tpkt(7, sshFxNoSuchFile)},
292292
}
293293
for _, tc := range testCases {
294294
tc.pkt.StatusError.msg = tc.err.Error()

0 commit comments

Comments
 (0)