From 2d05b28b0a108f07219cb5c6caafd9b855efcdb2 Mon Sep 17 00:00:00 2001
From: Ivan Andreev <ivandeex@gmail.com>
Date: Fri, 23 Jul 2021 02:02:19 +0300
Subject: [PATCH] ftp: enable CI for ProFtpd, PureFtpd, VsFtpd

---
 backend/ftp/ftp_test.go                  | 45 +++++++++++++-----------
 fstest/testserver/init.d/TestFTPProftpd  |  1 +
 fstest/testserver/init.d/TestFTPPureftpd |  1 +
 fstest/testserver/init.d/TestFTPVsftpd   |  1 +
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/backend/ftp/ftp_test.go b/backend/ftp/ftp_test.go
index 4eafa4510..64deb646e 100644
--- a/backend/ftp/ftp_test.go
+++ b/backend/ftp/ftp_test.go
@@ -9,25 +9,27 @@ import (
 	"github.com/rclone/rclone/fstest/fstests"
 )
 
-// TestIntegration runs integration tests against the remote
+// TestIntegration runs integration tests against rclone FTP server
 func TestIntegration(t *testing.T) {
-	fstests.Run(t, &fstests.Opt{
-		RemoteName: "TestFTPProftpd:",
-		NilObject:  (*ftp.Object)(nil),
-	})
-}
-
-func TestIntegration2(t *testing.T) {
-	if *fstest.RemoteName != "" {
-		t.Skip("skipping as -remote is set")
-	}
 	fstests.Run(t, &fstests.Opt{
 		RemoteName: "TestFTPRclone:",
 		NilObject:  (*ftp.Object)(nil),
 	})
 }
 
-func TestIntegration3(t *testing.T) {
+// TestIntegrationProftpd runs integration tests against proFTPd
+func TestIntegrationProftpd(t *testing.T) {
+	if *fstest.RemoteName != "" {
+		t.Skip("skipping as -remote is set")
+	}
+	fstests.Run(t, &fstests.Opt{
+		RemoteName: "TestFTPProftpd:",
+		NilObject:  (*ftp.Object)(nil),
+	})
+}
+
+// TestIntegrationPureftpd runs integration tests against pureFTPd
+func TestIntegrationPureftpd(t *testing.T) {
 	if *fstest.RemoteName != "" {
 		t.Skip("skipping as -remote is set")
 	}
@@ -37,12 +39,13 @@ func TestIntegration3(t *testing.T) {
 	})
 }
 
-// func TestIntegration4(t *testing.T) {
-// 	if *fstest.RemoteName != "" {
-// 		t.Skip("skipping as -remote is set")
-// 	}
-// 	fstests.Run(t, &fstests.Opt{
-// 		RemoteName: "TestFTPVsftpd:",
-// 		NilObject:  (*ftp.Object)(nil),
-// 	})
-// }
+// TestIntegrationVsftpd runs integration tests against vsFTPd
+func TestIntegrationVsftpd(t *testing.T) {
+	if *fstest.RemoteName != "" {
+		t.Skip("skipping as -remote is set")
+	}
+	fstests.Run(t, &fstests.Opt{
+		RemoteName: "TestFTPVsftpd:",
+		NilObject:  (*ftp.Object)(nil),
+	})
+}
diff --git a/fstest/testserver/init.d/TestFTPProftpd b/fstest/testserver/init.d/TestFTPProftpd
index 2f9e5dd7b..10df10f64 100755
--- a/fstest/testserver/init.d/TestFTPProftpd
+++ b/fstest/testserver/init.d/TestFTPProftpd
@@ -18,6 +18,7 @@ start() {
     echo host=$(docker_ip)
     echo user=$USER
     echo pass=$(rclone obscure $PASS)
+    echo encoding=Asterisk,Ctl,Dot,Slash
     echo _connect=$(docker_ip):21
 }
 
diff --git a/fstest/testserver/init.d/TestFTPPureftpd b/fstest/testserver/init.d/TestFTPPureftpd
index 23879d64c..4b66b84d9 100755
--- a/fstest/testserver/init.d/TestFTPPureftpd
+++ b/fstest/testserver/init.d/TestFTPPureftpd
@@ -22,6 +22,7 @@ start() {
     echo host=$(docker_ip)
     echo user=$USER
     echo pass=$(rclone obscure $PASS)
+    echo encoding=BackSlash,Ctl,Del,Dot,RightSpace,Slash,SquareBracket
     echo _connect=$(docker_ip):21
 }
 
diff --git a/fstest/testserver/init.d/TestFTPVsftpd b/fstest/testserver/init.d/TestFTPVsftpd
index 3956619b2..abfa8bf50 100755
--- a/fstest/testserver/init.d/TestFTPVsftpd
+++ b/fstest/testserver/init.d/TestFTPVsftpd
@@ -18,6 +18,7 @@ start() {
     echo host=$(docker_ip)
     echo user=$USER
     echo pass=$(rclone obscure $PASS)
+    echo encoding=Ctl,LeftPeriod,Slash
     echo _connect=$(docker_ip):21
 }