mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t910*: s/repo-config/config/g; poke around possible race conditions

Browse Source 
Some of the repo-config => config renaming missed the git-svn
tests; so I'm just renaming them to be consisten with the
rest of the modern git.

Also, some of the newer tests didn't have 'poke' in them
to workaround race conditions on fast machines.  This adds
places where they can _possibly_ occur; but I don't have
fast enough hardware to trigger them.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong
2007-02-13 17:38:58 -08:00
parent 3bc718ba66
commit ccb6b6f5b5
5 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t9100-git-svn-basic.sh
View File

@ -214,7 +214,7 @@ EOF
test_expect_success "$name" "diff -u a expected" test_expect_success "$name" "diff -u a expected"
test_expect_failure 'exit if remote refs are ambigious' " test_expect_failure 'exit if remote refs are ambigious' "
git-repo-config --add svn-remote.svn.fetch \ git-config --add svn-remote.svn.fetch \
bar:refs/remotes/git-svn && bar:refs/remotes/git-svn &&
git-svn migrate git-svn migrate
" "
@ -222,7 +222,7 @@ test_expect_failure 'exit if remote refs are ambigious' "
test_expect_failure 'exit if init-ing a would clobber a URL' " test_expect_failure 'exit if init-ing a would clobber a URL' "
svnadmin create ${PWD}/svnrepo2 && svnadmin create ${PWD}/svnrepo2 &&
svn mkdir -m 'mkdir bar' ${svnrepo}2/bar && svn mkdir -m 'mkdir bar' ${svnrepo}2/bar &&
git-repo-config --unset svn-remote.svn.fetch \ git-config --unset svn-remote.svn.fetch \
'^bar:refs/remotes/git-svn$' && '^bar:refs/remotes/git-svn$' &&
git-svn init ${svnrepo}2/bar git-svn init ${svnrepo}2/bar
" "
@ -230,9 +230,9 @@ test_expect_failure 'exit if init-ing a would clobber a URL' "
test_expect_success \ test_expect_success \
'init allows us to connect to another directory in the same repo' " 'init allows us to connect to another directory in the same repo' "
git-svn init -i bar $svnrepo/bar && git-svn init -i bar $svnrepo/bar &&
git repo-config --get svn-remote.svn.fetch \ git config --get svn-remote.svn.fetch \
'^bar:refs/remotes/bar$' && '^bar:refs/remotes/bar$' &&
git repo-config --get svn-remote.svn.fetch \ git config --get svn-remote.svn.fetch \
'^:refs/remotes/git-svn$' '^:refs/remotes/git-svn$'
" "

9
t/t9104-git-svn-follow-parent.sh
View File

@ -39,10 +39,10 @@ test_expect_success 'init and fetch a moved directory' "
" "
test_expect_success 'init and fetch from one svn-remote' " test_expect_success 'init and fetch from one svn-remote' "
git-repo-config svn-remote.svn.url $svnrepo && git-config svn-remote.svn.url $svnrepo &&
git-repo-config --add svn-remote.svn.fetch \ git-config --add svn-remote.svn.fetch \
trunk:refs/remotes/svn/trunk && trunk:refs/remotes/svn/trunk &&
git-repo-config --add svn-remote.svn.fetch \ git-config --add svn-remote.svn.fetch \
thunk:refs/remotes/svn/thunk && thunk:refs/remotes/svn/thunk &&
git-svn fetch -i svn/thunk && git-svn fetch -i svn/thunk &&
test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \ test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \
@ -54,7 +54,7 @@ test_expect_success 'init and fetch from one svn-remote' "
test_expect_success 'follow deleted parent' " test_expect_success 'follow deleted parent' "
svn cp -m 'resurrecting trunk as junk' \ svn cp -m 'resurrecting trunk as junk' \
-r2 $svnrepo/trunk $svnrepo/junk && -r2 $svnrepo/trunk $svnrepo/junk &&
git-repo-config --add svn-remote.svn.fetch \ git-config --add svn-remote.svn.fetch \
junk:refs/remotes/svn/junk && junk:refs/remotes/svn/junk &&
git-svn fetch -i svn/thunk && git-svn fetch -i svn/thunk &&
git-svn fetch -i svn/junk && git-svn fetch -i svn/junk &&
@ -124,6 +124,7 @@ test_expect_success 'follow-parent avoids deleting relevant info' "
svn mv t native/t && svn mv t native/t &&
for i in a b c; do svn mv \$i.pm native/\$i.pm; done && for i in a b c; do svn mv \$i.pm native/\$i.pm; done &&
echo z >> native/t/c.t && echo z >> native/t/c.t &&
poke native/t/c.t &&
svn commit -m 'reorg test' && svn commit -m 'reorg test' &&
cd .. && cd .. &&
git-svn init -i r9270-t \ git-svn init -i r9270-t \

14
t/t9107-git-svn-migrate.sh
View File

@ -34,14 +34,14 @@ test_expect_success 'initialize old-style (v0) git-svn layout' "
! test -d $GIT_DIR/git-svn && ! test -d $GIT_DIR/git-svn &&
git-rev-parse --verify refs/remotes/git-svn^0 && git-rev-parse --verify refs/remotes/git-svn^0 &&
git-rev-parse --verify refs/remotes/svn^0 && git-rev-parse --verify refs/remotes/svn^0 &&
test \`git repo-config --get svn-remote.svn.url\` = '$svnrepo' && test \`git config --get svn-remote.svn.url\` = '$svnrepo' &&
test \`git repo-config --get svn-remote.svn.fetch\` = \ test \`git config --get svn-remote.svn.fetch\` = \
':refs/remotes/git-svn' ':refs/remotes/git-svn'
" "
test_expect_success 'initialize a multi-repository repo' " test_expect_success 'initialize a multi-repository repo' "
git-svn multi-init $svnrepo -T trunk -t tags -b branches && git-svn multi-init $svnrepo -T trunk -t tags -b branches &&
git-repo-config --get-all svn-remote.svn.fetch > fetch.out && git-config --get-all svn-remote.svn.fetch > fetch.out &&
grep '^trunk:refs/remotes/trunk$' fetch.out && grep '^trunk:refs/remotes/trunk$' fetch.out &&
test -n \"\`git-config --get svn-remote.svn.branches \ test -n \"\`git-config --get svn-remote.svn.branches \
'^branches/\*:refs/remotes/\*$'\`\" && '^branches/\*:refs/remotes/\*$'\`\" &&
@ -73,8 +73,8 @@ test_expect_success 'multi-fetch works on partial urls + paths' "
" "
test_expect_success 'migrate --minimize on old multi-inited layout' " test_expect_success 'migrate --minimize on old multi-inited layout' "
git repo-config --unset-all svn-remote.svn.fetch && git config --unset-all svn-remote.svn.fetch &&
git repo-config --unset-all svn-remote.svn.url && git config --unset-all svn-remote.svn.url &&
rm -rf $GIT_DIR/svn && rm -rf $GIT_DIR/svn &&
for i in \`cat fetch.out\`; do for i in \`cat fetch.out\`; do
path=\`expr \$i : '\\([^:]*\\):.*$'\` path=\`expr \$i : '\\([^:]*\\):.*$'\`
@ -85,8 +85,8 @@ test_expect_success 'migrate --minimize on old multi-inited layout' "
echo $svnrepo\$path > $GIT_DIR/svn/\$ref/info/url ) || exit 1; echo $svnrepo\$path > $GIT_DIR/svn/\$ref/info/url ) || exit 1;
done && done &&
git-svn migrate --minimize && git-svn migrate --minimize &&
test -z \"\`git-repo-config -l |grep -v '^svn-remote\.git-svn\.'\`\" && test -z \"\`git-config -l |grep -v '^svn-remote\.git-svn\.'\`\" &&
git-repo-config --get-all svn-remote.svn.fetch > fetch.out && git-config --get-all svn-remote.svn.fetch > fetch.out &&
grep '^trunk:refs/remotes/trunk$' fetch.out && grep '^trunk:refs/remotes/trunk$' fetch.out &&
grep '^branches/a:refs/remotes/a$' fetch.out && grep '^branches/a:refs/remotes/a$' fetch.out &&
grep '^branches/b:refs/remotes/b$' fetch.out && grep '^branches/b:refs/remotes/b$' fetch.out &&

5
t/t9108-git-svn-glob.sh
View File

@ -23,14 +23,19 @@ test_expect_success 'test refspec globbing' "
svn commit -m 'start a new branch' && svn commit -m 'start a new branch' &&
svn up && svn up &&
echo 'hi' >> branches/start/src/b/readme && echo 'hi' >> branches/start/src/b/readme &&
poke branches/start/src/b/readme &&
echo 'hey' >> branches/start/src/a/readme && echo 'hey' >> branches/start/src/a/readme &&
poke branches/start/src/a/readme &&
svn commit -m 'hi' && svn commit -m 'hi' &&
svn up && svn up &&
svn cp branches/start tags/end && svn cp branches/start tags/end &&
echo 'bye' >> tags/end/src/b/readme && echo 'bye' >> tags/end/src/b/readme &&
poke tags/end/src/b/readme &&
echo 'aye' >> tags/end/src/a/readme && echo 'aye' >> tags/end/src/a/readme &&
poke tags/end/src/a/readme &&
svn commit -m 'the end' && svn commit -m 'the end' &&
echo 'byebye' >> tags/end/src/b/readme && echo 'byebye' >> tags/end/src/b/readme &&
poke tags/end/src/b/readme &&
svn commit -m 'nothing to see here' svn commit -m 'nothing to see here'
cd .. && cd .. &&
git config --add svn-remote.svn.url $svnrepo && git config --add svn-remote.svn.url $svnrepo &&

2
t/t9109-git-svn-svk-mirrorpaths.sh
View File

@ -55,11 +55,13 @@ test_expect_success 'initialize repo' "
svn up && svn up &&
echo random untested feature >> mirror/foobar/trunk/readme && echo random untested feature >> mirror/foobar/trunk/readme &&
poke mirror/foobar/trunk/readme &&
svn commit -m 'add a c00l feature to trunk' && svn commit -m 'add a c00l feature to trunk' &&
svn ps -r 5 --revprop svm:headrev $uuid:3 $svnrepo && svn ps -r 5 --revprop svm:headrev $uuid:3 $svnrepo &&
svn up && svn up &&
echo bug fix >> mirror/foobar/branches/silly/readme && echo bug fix >> mirror/foobar/branches/silly/readme &&
poke mirror/foobar/branches/silly/readme &&
svn commit -m 'fix a bug' && svn commit -m 'fix a bug' &&
svn ps -r 6 --revprop svm:headrev $uuid:4 $svnrepo && svn ps -r 6 --revprop svm:headrev $uuid:4 $svnrepo &&