6 files changed, 166 insertions, 7 deletions
diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index eb6c9a109..1b610a260 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -4,9 +4,13 @@
 # per line.
 # Lines starting with '#' letters are treated as comments.
 #230
-600
-601
-602
-603
-604
-605
+#600
+#601
+#602
+#603
+#604
+#605
+#606
+#607
+#608
+#609
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index e02c36cc5..59eb9a2d5 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -39,4 +39,4 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test534 test535 test281 test537 test282 test283 test284 test538 test285   \
  test286 test307 test308 test287 test400 test288 test600 test601 test602   \
  test603 test401 test402 test290 test291 test292 test293 test403 test404   \
- test405
+ test405 test604 test605 test606 test607 test608 test609
diff --git a/tests/data/test606 b/tests/data/test606
new file mode 100644
index 000000000..6a72a92c5
--- /dev/null
+++ b/tests/data/test606
@@ -0,0 +1,33 @@
+<testcase>
+<info>
+<keywords>
+SFTP
+FAILURE
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+sftp
+</server>
+ <name>
+SFTP invalid user login
+ </name>
+ <command>
+--key curl_client_key --pubkey curl_client_key.pub -u not-a-valid-user: sftp://%HOSTIP:%SSHPORT%PWD/not-a-valid-file-moooo
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+2
+</errorcode>
+<valgrind>
+disable
+</valgrind>
+</verify>
+</testcase>
diff --git a/tests/data/test607 b/tests/data/test607
new file mode 100644
index 000000000..66e08e12a
--- /dev/null
+++ b/tests/data/test607
@@ -0,0 +1,33 @@
+<testcase>
+<info>
+<keywords>
+SCP
+FAILURE
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+scp
+</server>
+ <name>
+SCP invalid user login
+ </name>
+ <command>
+--key curl_client_key --pubkey curl_client_key.pub -u not-a-valid-user: scp://%HOSTIP:%SSHPORT%PWD/not-a-valid-file-moooo
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+2
+</errorcode>
+<valgrind>
+disable
+</valgrind>
+</verify>
+</testcase>
diff --git a/tests/data/test608 b/tests/data/test608
new file mode 100644
index 000000000..0a307fb18
--- /dev/null
+++ b/tests/data/test608
@@ -0,0 +1,44 @@
+<testcase>
+<info>
+<keywords>
+SFTP
+post-quote
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+Test file for rename test
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+sftp
+</server>
+ <name>
+SFTP post-quote rename
+ </name>
+ <command>
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/file608.txt %PWD/log/file608-renamed.txt" sftp://%HOSTIP:%SSHPORT%PWD/log/file608.txt
+</command>
+<file name="log/file608.txt">
+Test file for rename test
+</file>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<file name="log/file608-renamed.txt">
+Test file for rename test
+</file>
+<valgrind>
+disable
+</valgrind>
+</verify>
+</testcase>
diff --git a/tests/data/test609 b/tests/data/test609
new file mode 100644
index 000000000..d998a3bdf
--- /dev/null
+++ b/tests/data/test609
@@ -0,0 +1,45 @@
+<testcase>
+<info>
+<keywords>
+SFTP
+post-quote
+FAILURE
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+Test file for mkdir test
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+sftp
+</server>
+ <name>
+SFTP post-quote mkdir failure
+ </name>
+ <command>
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-mkdir %PWD/log/file609.txt" sftp://%HOSTIP:%SSHPORT%PWD/log/file609.txt
+</command>
+<file name="log/file609.txt">
+Test file for mkdir test
+</file>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+21
+</errorcode>
+<valgrind>
+disable
+</valgrind>
+</verify>
+</testcase>