Skip to content

Commit a10a4fc

Browse files
committed
Merge branch 'claude/issue-498-20250901-2246' of github.com:fclairamb/ftpserverlib into claude/issue-498-20250901-2246
2 parents ba3ae85 + 59cee41 commit a10a4fc

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

client_handler_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestConcurrency(t *testing.T) {
5050
func TestDOS(t *testing.T) {
5151
server := NewTestServer(t, true)
5252
dialer := &net.Dialer{Timeout: 5 * time.Second}
53-
conn, err := dialer.DialContext(context.Background(), "tcp", server.Addr())
53+
conn, err := dialer.DialContext(t.Context(), "tcp", server.Addr())
5454
require.NoError(t, err)
5555

5656
defer func() {
@@ -153,7 +153,7 @@ func TestConnectionNotAllowed(t *testing.T) {
153153
s := NewTestServerWithTestDriver(t, driver)
154154

155155
dialer := &net.Dialer{Timeout: 5 * time.Second}
156-
conn, err := dialer.DialContext(context.Background(), "tcp", s.Addr())
156+
conn, err := dialer.DialContext(t.Context(), "tcp", s.Addr())
157157
require.NoError(t, err)
158158

159159
defer func() {

handle_auth_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestLoginSuccess(t *testing.T) {
2121
server := NewTestServer(t, false)
2222
// send a NOOP before the login, this doesn't seems possible using secsy/goftp so use the old way ...
2323
dialer := &net.Dialer{Timeout: 5 * time.Second}
24-
conn, err := dialer.DialContext(context.Background(), "tcp", server.Addr())
24+
conn, err := dialer.DialContext(t.Context(), "tcp", server.Addr())
2525
require.NoError(t, err)
2626

2727
defer func() {

handle_dirs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ func TestPerClientTLSTransfer(t *testing.T) {
462462
func TestDirListingBeforeLogin(t *testing.T) {
463463
s := NewTestServer(t, false)
464464
dialer := &net.Dialer{Timeout: 5 * time.Second}
465-
conn, err := dialer.DialContext(context.Background(), "tcp", s.Addr())
465+
conn, err := dialer.DialContext(t.Context(), "tcp", s.Addr())
466466
require.NoError(t, err)
467467

468468
defer func() {

handle_files.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ func (c *clientHandler) computeHashForFile(filePath string, algo HASHAlgo, start
689689
case HASHAlgoSHA512:
690690
chosenHashAlgo = sha512.New()
691691
default:
692-
return "", errUnknowHash
692+
return "", errUnknownHash
693693
}
694694

695695
file, err = c.getFileHandle(filePath, os.O_RDONLY, start)

handle_misc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111
)
1212

13-
var errUnknowHash = errors.New("unknown hash algorithm")
13+
var errUnknownHash = errors.New("unknown hash algorithm")
1414

1515
func (c *clientHandler) handleAUTH(_ string) error {
1616
if tlsConfig, err := c.server.driver.GetTLSConfig(); err == nil {

server_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func TestCannotListen(t *testing.T) {
8686
req := require.New(t)
8787

8888
lc := &net.ListenConfig{}
89-
portBlockerListener, err := lc.Listen(context.Background(), "tcp", "127.0.0.1:0")
89+
portBlockerListener, err := lc.Listen(t.Context(), "tcp", "127.0.0.1:0")
9090
req.NoError(err)
9191

9292
defer func() { req.NoError(portBlockerListener.Close()) }()
@@ -110,7 +110,7 @@ func TestListenWithBadTLSSettings(t *testing.T) {
110110
req := require.New(t)
111111

112112
lc := &net.ListenConfig{}
113-
portBlockerListener, err := lc.Listen(context.Background(), "tcp", "127.0.0.1:0")
113+
portBlockerListener, err := lc.Listen(t.Context(), "tcp", "127.0.0.1:0")
114114
req.NoError(err)
115115

116116
defer func() { req.NoError(portBlockerListener.Close()) }()

transfer_active_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestRemoteAddrFormat(t *testing.T) {
2828

2929
func TestActiveTransferFromPort20(t *testing.T) {
3030
lc := &net.ListenConfig{}
31-
listener, err := lc.Listen(context.Background(), "tcp", ":20")
31+
listener, err := lc.Listen(t.Context(), "tcp", ":20")
3232
if err != nil {
3333
t.Skipf("Binding on port 20 is not supported here: %v", err)
3434
}

transfer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ func TestPASVIPMatch(t *testing.T) {
11061106
server := NewTestServer(t, false)
11071107

11081108
dialer := &net.Dialer{Timeout: 5 * time.Second}
1109-
conn, err := dialer.DialContext(context.Background(), "tcp", server.Addr())
1109+
conn, err := dialer.DialContext(t.Context(), "tcp", server.Addr())
11101110
require.NoError(t, err)
11111111

11121112
defer func() {

0 commit comments

Comments
 (0)