tests: replace %PWD with %SSH_PWD in SCP/SFTP tests
Cherry-picked from #14949 Closes #15103
This commit is contained in:
parent
10ddf4c66a
commit
ca9106c1e9
@ -24,7 +24,7 @@ sftp
|
|||||||
SFTP post-quote rename
|
SFTP post-quote rename
|
||||||
</name>
|
</name>
|
||||||
<command>
|
<command>
|
||||||
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %PWD/%LOGDIR/file%TESTNUMBER.txt %PWD/%LOGDIR/file%TESTNUMBER-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %SSH_PWD/%LOGDIR/file%TESTNUMBER.txt %SSH_PWD/%LOGDIR/file%TESTNUMBER-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
||||||
</command>
|
</command>
|
||||||
# Verify that the file was renamed properly, then rename the file back to what
|
# Verify that the file was renamed properly, then rename the file back to what
|
||||||
# it was so the verify section works and the file can be cleaned up.
|
# it was so the verify section works and the file can be cleaned up.
|
||||||
|
|||||||
@ -25,7 +25,7 @@ sftp
|
|||||||
SFTP post-quote mkdir failure
|
SFTP post-quote mkdir failure
|
||||||
</name>
|
</name>
|
||||||
<command>
|
<command>
|
||||||
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-mkdir %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-mkdir %SSH_PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
||||||
</command>
|
</command>
|
||||||
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
||||||
Test file for mkdir test
|
Test file for mkdir test
|
||||||
|
|||||||
@ -27,7 +27,7 @@ sftp
|
|||||||
SFTP post-quote rmdir
|
SFTP post-quote rmdir
|
||||||
</name>
|
</name>
|
||||||
<command>
|
<command>
|
||||||
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rmdir %SSH_PWD/%LOGDIR/test%TESTNUMBER.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
||||||
</command>
|
</command>
|
||||||
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
||||||
Dummy test file for rmdir test
|
Dummy test file for rmdir test
|
||||||
|
|||||||
@ -27,7 +27,7 @@ sftp
|
|||||||
SFTP post-quote rename
|
SFTP post-quote rename
|
||||||
</name>
|
</name>
|
||||||
<command>
|
<command>
|
||||||
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %SSH_PWD/%LOGDIR/test%TESTNUMBER.dir %SSH_PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
||||||
</command>
|
</command>
|
||||||
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
||||||
Dummy test file for rename test
|
Dummy test file for rename test
|
||||||
|
|||||||
@ -24,7 +24,7 @@ sftp
|
|||||||
SFTP post-quote remove file
|
SFTP post-quote remove file
|
||||||
</name>
|
</name>
|
||||||
<command>
|
<command>
|
||||||
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt -Q "-rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure
|
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt -Q "-rm %SSH_PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure
|
||||||
</command>
|
</command>
|
||||||
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
||||||
Dummy test file for remove test
|
Dummy test file for remove test
|
||||||
|
|||||||
@ -30,7 +30,7 @@ sftp
|
|||||||
SFTP pre-quote chmod
|
SFTP pre-quote chmod
|
||||||
</name>
|
</name>
|
||||||
<command>
|
<command>
|
||||||
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure
|
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "chmod 444 %SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure
|
||||||
</command>
|
</command>
|
||||||
</client>
|
</client>
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@ sftp
|
|||||||
SFTP quote remove file with NOBODY
|
SFTP quote remove file with NOBODY
|
||||||
</name>
|
</name>
|
||||||
<command>
|
<command>
|
||||||
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -I -Q "rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT --insecure
|
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -I -Q "rm %SSH_PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT --insecure
|
||||||
</command>
|
</command>
|
||||||
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
||||||
Dummy test file for remove test
|
Dummy test file for remove test
|
||||||
|
|||||||
@ -29,7 +29,7 @@ sftp
|
|||||||
SFTP post-quote rename * asterisk accept-fail
|
SFTP post-quote rename * asterisk accept-fail
|
||||||
</name>
|
</name>
|
||||||
<command>
|
<command>
|
||||||
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %SSH_PWD/%LOGDIR/test%TESTNUMBER.dir %SSH_PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
||||||
</command>
|
</command>
|
||||||
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
||||||
Dummy test file for rename test
|
Dummy test file for rename test
|
||||||
|
|||||||
@ -29,7 +29,7 @@ sftp
|
|||||||
SFTP post-quote rename * asterisk accept-fail
|
SFTP post-quote rename * asterisk accept-fail
|
||||||
</name>
|
</name>
|
||||||
<command>
|
<command>
|
||||||
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER-not-exists-dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %SSH_PWD/%LOGDIR/test%TESTNUMBER-not-exists-dir %SSH_PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
|
||||||
</command>
|
</command>
|
||||||
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
||||||
Dummy test file for rename test
|
Dummy test file for rename test
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user