Merge branch 'fl/cvsserver'
* fl/cvsserver: t9400: Add some basic pserver tests t9400: Add some more cvs update tests t9400: Add test cases for config file handling
This commit is contained in:
Junio C Hamano
commit
2720de4261
@ -47,6 +47,109 @@ test_expect_success 'basic checkout' \
|
||||
'GIT_CONFIG="$git_config" cvs -Q co -d cvswork master &&
|
||||
test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5))" = "empty/1.1/"'
|
||||
|
||||
#------------------------
|
||||
# PSERVER AUTHENTICATION
|
||||
#------------------------
|
||||
|
||||
cat >request-anonymous <<EOF
|
||||
BEGIN AUTH REQUEST
|
||||
$SERVERDIR
|
||||
anonymous
|
||||
|
||||
END AUTH REQUEST
|
||||
EOF
|
||||
|
||||
cat >request-git <<EOF
|
||||
BEGIN AUTH REQUEST
|
||||
$SERVERDIR
|
||||
git
|
||||
|
||||
END AUTH REQUEST
|
||||
EOF
|
||||
|
||||
test_expect_success 'pserver authentication' \
|
||||
'cat request-anonymous | git-cvsserver pserver >log 2>&1 &&
|
||||
tail -n1 log | grep -q "^I LOVE YOU$"'
|
||||
|
||||
test_expect_success 'pserver authentication failure (non-anonymous user)' \
|
||||
'if cat request-git | git-cvsserver pserver >log 2>&1
|
||||
then
|
||||
false
|
||||
else
|
||||
true
|
||||
fi &&
|
||||
tail -n1 log | grep -q "^I HATE YOU$"'
|
||||
|
||||
|
||||
#--------------
|
||||
# CONFIG TESTS
|
||||
#--------------
|
||||
|
||||
test_expect_success 'gitcvs.enabled = false' \
|
||||
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
|
||||
if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
|
||||
then
|
||||
echo unexpected cvs success
|
||||
false
|
||||
else
|
||||
true
|
||||
fi &&
|
||||
cat cvs.log | grep -q "GITCVS emulation disabled" &&
|
||||
test ! -d cvswork2'
|
||||
|
||||
rm -fr cvswork2
|
||||
test_expect_success 'gitcvs.ext.enabled = true' \
|
||||
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
|
||||
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
|
||||
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
|
||||
diff -q cvswork cvswork2'
|
||||
|
||||
rm -fr cvswork2
|
||||
test_expect_success 'gitcvs.ext.enabled = false' \
|
||||
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
|
||||
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
|
||||
if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
|
||||
then
|
||||
echo unexpected cvs success
|
||||
false
|
||||
else
|
||||
true
|
||||
fi &&
|
||||
cat cvs.log | grep -q "GITCVS emulation disabled" &&
|
||||
test ! -d cvswork2'
|
||||
|
||||
rm -fr cvswork2
|
||||
test_expect_success 'gitcvs.dbname' \
|
||||
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
|
||||
GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
|
||||
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
|
||||
diff -q cvswork cvswork2 &&
|
||||
test -f "$SERVERDIR/gitcvs.ext.master.sqlite" &&
|
||||
cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs.ext.master.sqlite"'
|
||||
|
||||
rm -fr cvswork2
|
||||
test_expect_success 'gitcvs.ext.dbname' \
|
||||
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
|
||||
GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
|
||||
GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
|
||||
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
|
||||
diff -q cvswork cvswork2 &&
|
||||
test -f "$SERVERDIR/gitcvs1.ext.master.sqlite" &&
|
||||
test ! -f "$SERVERDIR/gitcvs2.ext.master.sqlite" &&
|
||||
cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs1.ext.master.sqlite"'
|
||||
|
||||
|
||||
#------------
|
||||
# CVS UPDATE
|
||||
#------------
|
||||
|
||||
rm -fr "$SERVERDIR"
|
||||
cd "$WORKDIR" &&
|
||||
git clone -q --local --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
|
||||
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
|
||||
GIT_DIR="$SERVERDIR" git config --bool gitcvs.logfile "$SERVERDIR/gitcvs.log" ||
|
||||
exit 1
|
||||
|
||||
test_expect_success 'cvs update (create new file)' \
|
||||
'echo testfile1 >testfile1 &&
|
||||
git add testfile1 &&
|
||||
@ -123,4 +226,73 @@ test_expect_success 'cvs update (re-add deleted file)' \
|
||||
test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.4/" &&
|
||||
diff -q testfile1 ../testfile1'
|
||||
|
||||
cd "$WORKDIR"
|
||||
test_expect_success 'cvs update (merge)' \
|
||||
'echo Line 0 >expected &&
|
||||
for i in 1 2 3 4 5 6 7
|
||||
do
|
||||
echo Line $i >>merge
|
||||
echo Line $i >>expected
|
||||
done &&
|
||||
echo Line 8 >>expected &&
|
||||
git add merge &&
|
||||
git commit -q -m "Merge test (pre-merge)" &&
|
||||
git push gitcvs.git >/dev/null &&
|
||||
cd cvswork &&
|
||||
GIT_CONFIG="$git_config" cvs -Q update &&
|
||||
test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" &&
|
||||
diff -q merge ../merge &&
|
||||
( echo Line 0; cat merge ) >merge.tmp &&
|
||||
mv merge.tmp merge &&
|
||||
cd "$WORKDIR" &&
|
||||
echo Line 8 >>merge &&
|
||||
git add merge &&
|
||||
git commit -q -m "Merge test (merge)" &&
|
||||
git push gitcvs.git >/dev/null &&
|
||||
cd cvswork &&
|
||||
GIT_CONFIG="$git_config" cvs -Q update &&
|
||||
diff -q merge ../expected'
|
||||
|
||||
cd "$WORKDIR"
|
||||
|
||||
cat >expected.C <<EOF
|
||||
<<<<<<< merge.mine
|
||||
Line 0
|
||||
=======
|
||||
LINE 0
|
||||
>>>>>>> merge.3
|
||||
EOF
|
||||
|
||||
for i in 1 2 3 4 5 6 7 8
|
||||
do
|
||||
echo Line $i >>expected.C
|
||||
done
|
||||
|
||||
test_expect_success 'cvs update (conflict merge)' \
|
||||
'( echo LINE 0; cat merge ) >merge.tmp &&
|
||||
mv merge.tmp merge &&
|
||||
git add merge &&
|
||||
git commit -q -m "Merge test (conflict)" &&
|
||||
git push gitcvs.git >/dev/null &&
|
||||
cd cvswork &&
|
||||
GIT_CONFIG="$git_config" cvs -Q update &&
|
||||
diff -q merge ../expected.C'
|
||||
|
||||
cd "$WORKDIR"
|
||||
test_expect_success 'cvs update (-C)' \
|
||||
'cd cvswork &&
|
||||
GIT_CONFIG="$git_config" cvs -Q update -C &&
|
||||
diff -q merge ../merge'
|
||||
|
||||
cd "$WORKDIR"
|
||||
test_expect_success 'cvs update (merge no-op)' \
|
||||
'echo Line 9 >>merge &&
|
||||
cp merge cvswork/merge &&
|
||||
git add merge &&
|
||||
git commit -q -m "Merge test (no-op)" &&
|
||||
git push gitcvs.git >/dev/null &&
|
||||
cd cvswork &&
|
||||
GIT_CONFIG="$git_config" cvs -Q update &&
|
||||
diff -q merge ../merge'
|
||||
|
||||
test_done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user