- djm@cvs.openbsd.org 2008/03/24 21:46:54

     [regress/sftp-badcmds.sh]
     disable no-replace rename test now that we prefer a POSIX rename; spotted
     by dkrause@

diff --git a/ChangeLog b/ChangeLog
index e13951df5f8ea0966fcd74547159b813e1ce5d91..c355c3eff3196fb04e82f7de15438eb0a670b7aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,10 @@
    - djm@cvs.openbsd.org 2008/03/27 00:16:49
      [version.h]
      openssh-4.9
+   - djm@cvs.openbsd.org 2008/03/24 21:46:54
+     [regress/sftp-badcmds.sh]
+     disable no-replace rename test now that we prefer a POSIX rename; spotted
+     by dkrause@
 
 20080315
  - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are

diff --git a/regress/sftp-badcmds.sh b/regress/sftp-badcmds.sh
index eac189aaf31aaf160685c90bc223abf22f2ce985..b48b1cb01cf3dff24ef0c901dcd47dd9196767c4 100644 (file)
--- a/regress/sftp-badcmds.sh
+++ b/regress/sftp-badcmds.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: sftp-badcmds.sh,v 1.2 2003/05/15 04:07:12 mouring Exp $
+#      $OpenBSD: sftp-badcmds.sh,v 1.3 2008/03/24 21:46:54 djm Exp $
 #      Placed in the Public Domain.
 
 tid="sftp invalid commands"
@@ -45,17 +45,6 @@ echo "rename $NONEXIST ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
        || fail "rename nonexist failed"
 test -f ${COPY}.1 && fail "file exists after rename nonexistent"
 
-rm -f ${COPY} ${COPY}.1
-cp $DATA $COPY
-cp $DATA2 ${COPY}.1
-verbose "$tid: rename target exists"
-echo "rename $COPY ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-       || fail "rename target exists failed"
-test -f ${COPY} || fail "oldname missing after rename target exists"
-test -f ${COPY}.1 || fail "newname missing after rename target exists"
-cmp $DATA ${COPY} >/dev/null 2>&1 || fail "corrupted oldname after rename target exists"
-cmp $DATA2 ${COPY}.1 >/dev/null 2>&1 || fail "corrupted newname after rename target exists"
-
 rm -rf ${COPY} ${COPY}.dd
 cp $DATA $COPY
 mkdir ${COPY}.dd