Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b0d791b
)
Apply patch from Steve Bonds to repair this test.
author
Paul Green
<paulg@samba.org>
Wed, 19 Feb 2003 16:22:50 +0000
(16:22 +0000)
committer
Paul Green
<paulg@samba.org>
Wed, 19 Feb 2003 16:22:50 +0000
(16:22 +0000)
testsuite/ssh-basic.test
patch
|
blob
|
blame
|
history
diff --git
a/testsuite/ssh-basic.test
b/testsuite/ssh-basic.test
index
caf880f
..
5fadcf3
100644
(file)
--- a/
testsuite/ssh-basic.test
+++ b/
testsuite/ssh-basic.test
@@
-23,8
+23,21
@@
if ! [ "`ssh -o'BatchMode yes' localhost echo yes`" = "yes" ]; then
test_skipped "Skipping SSH tests because ssh conection to localhost not authorised"
fi
test_skipped "Skipping SSH tests because ssh conection to localhost not authorised"
fi
+# Added by Steve Bonds Feb 2 2003
+# Without this, there are no files in the ${FROM} directory, so rsync has
+# nothing to do.
+hands_setup
+
runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
+# Added by Steve Bonds Feb 2 2003
+# I assumed that "F1" was intended to hold a single file for testing if
+# rsync could detect a renamed file over ssh. Without this line below
+# it was unset so the "mv" tried to move a parent directory into a
+# subdirectory of itself. There is probably a better way of pulling out
+# a sample file to rename.
+F1=`ls ${TO} | head -5 | tail -1`
+
mv ${TO}/${F1} ${TO}/ThisShouldGo
runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
mv ${TO}/${F1} ${TO}/ThisShouldGo
runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'