Commit ae3d5949 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Various test file cleanups, including using <servercmd> instead of writing 

directly to ftpserver.cmd and removing unneeded empty sections.
parent c234b9d0

tests/data/test100

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/ 
#

# Verify data after the test has been "shot"

<verify>

<strip>

filter off really nothing

</strip>

<protocol>

USER anonymous

PASS ftp@example.com

tests/data/test102

+3 −3
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ that FTP 
works

  so does it?

</data>

<servercmd>

REPLY EPSV 500 no such command

</servercmd>

</reply>



# Client-side
@@ -30,9 +33,6 @@ FTP RETR PASV 
ftp://%HOSTIP:%FTPPORT/102

</command>



<file name="log/ftpserver.cmd">

REPLY EPSV 500 no such command

</file>

</client>



# Verify data after the test has been "shot"

tests/data/test105

+4 −4
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ that FTP 
works

  so does it?

</data>

<servercmd>

REPLY EPSV 500 no such command

REPLY SIZE 500 no such command

</servercmd>

</reply>



# Client-side
@@ -30,10 +34,6 @@ FTP user+password in URL and ASCII transfer 
 <command>

ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii

</command>

<file name="log/ftpserver.cmd">

REPLY EPSV 500 no such command

REPLY SIZE 500 no such command

</file>

</client>



# Verify data after the test has been "shot"

tests/data/test109

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ Moooooooooooo 


# Verify data after the test has been "shot"

<verify>

<strip>

</strip>

<protocol>

USER anonymous

PASS ftp@example.com

tests/data/test110

+3 −5
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ but we emulate that 
<size>

85

</size>

<servercmd>

REPLY EPSV 500 no such command

</servercmd>

</reply>



# Client-side
@@ -29,15 +32,10 @@ FTP download resume with set limit 
 <command>

ftp://%HOSTIP:%FTPPORT/110 -C 20

</command>

<file name="log/ftpserver.cmd">

REPLY EPSV 500 no such command

</file>

</client>



# Verify data after the test has been "shot"

<verify>

<strip>

</strip>

<protocol>

USER anonymous

PASS ftp@example.com