6539009cb5
$ENV{GL_REPO_BASE_ABS} is meant to point to the same directory as $REPO_BASE, except it is meant to be passed to hooks, ADCs and other child programs. And since you can't be sure where the child program starts in, this became an absolute path. Gradually, however, I started using it wherever I needed an absolute path (mostly in code that jumps around various directories to do stuff). Which is silly, because there's no reason $REPO_BASE cannot also be made an absolute, even if the rc file has a relative path. So that's what I did now: made $REPO_BASE absolute very early on, and then systematically changed all uses of the longer form to the shorter form when appropriate. And so the only thing we now use the longer one for is to pass to child programs. (Implementation note: The actual change is not very big, but while I was about it I decided to make the test suite able to test with an absolute REPO_BASE also, which is why the commit seems so large.) ---- This all started with a complaint from Damien Regad. He had an extremely odd setup where his bashrc changed PWD to something other than $HOME before anything else ran. This caused those two variables to beceom inconsistent, and he had a 1-line fix he wanted me to apply. I generally don't like making special fixes for for non-standard setups, and anyway all he had to do was set the full path to REPO_BASE in the rc file to get around this. Which is what I told him and he very politely left it at that. However, this did get me thinking, and I soon realised I was needlessly conflating "relative versus absolute" with "able to be passed to child programs". Fixing that solved his problem also, as a side-effect. So I guess this is all thanks to Damien!
171 lines
7.8 KiB
Plaintext
171 lines
7.8 KiB
Plaintext
# vim: syn=sh:
|
|
for bc in 0 1
|
|
do
|
|
for ais in 0 1
|
|
do
|
|
cd $TESTDIR
|
|
$TESTDIR/rollback || die "rollback failed"
|
|
editrc GL_WILDREPOS 1
|
|
editrc GL_BIG_CONFIG $bc
|
|
echo "\$GL_ALL_INCLUDES_SPECIAL = $ais;" | addrc
|
|
|
|
name "INTERNAL"
|
|
echo "
|
|
@leads = u1 u2
|
|
@devs = u1 u2 u3 u4
|
|
|
|
@gbar = bar/CREATOR/..*
|
|
repo @gbar
|
|
C = @leads
|
|
RW+ = @leads
|
|
RW = WRITERS @devs
|
|
R = READERS
|
|
" | ugc
|
|
name "nothing set yet"
|
|
expect_push_ok "master -> master"
|
|
|
|
runlocal git ls-remote u1:bar/u1/try1
|
|
runremote ls -al $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok
|
|
expect "ls: cannot access $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok: No such file or directory"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
|
|
runremote cat projects.list
|
|
notexpect "bar/u1/try1.git"
|
|
|
|
runlocal git ls-remote u1:bar/u1/try2
|
|
runremote ls -al $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok
|
|
expect "ls: cannot access $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok: No such file or directory"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
|
|
runremote cat projects.list
|
|
notexpect "bar/u1/try2.git"
|
|
|
|
name "add daemon access to try1"
|
|
echo R daemon | runlocal ssh u1 setperms bar/u1/try1
|
|
expect "READERS daemon"
|
|
|
|
runremote ls -al $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok
|
|
expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
|
|
runremote cat projects.list
|
|
notexpect "bar/u1/try1.git"
|
|
|
|
name "add gitweb access to try2"
|
|
echo R gitweb | runlocal ssh u1 setperms bar/u1/try2
|
|
expect "READERS gitweb"
|
|
|
|
runremote ls -al $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok
|
|
expect "ls: cannot access $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok: No such file or directory"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 16 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 28 .* projects.list"
|
|
runremote cat projects.list
|
|
expect "bar/u1/try2.git"
|
|
|
|
echo "\$GL_WILDREPOS_DEFPERMS = 'R daemon';" | addrc
|
|
|
|
name "add default daemon access"
|
|
runlocal git ls-remote u1:bar/u1/try3
|
|
runremote ls -al $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok
|
|
expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 16 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 28 .* projects.list"
|
|
runremote cat projects.list
|
|
notexpect "bar/u1/try3.git"
|
|
|
|
name "add default gitweb access"
|
|
echo "\$GL_WILDREPOS_DEFPERMS = 'R gitweb';" | addrc
|
|
|
|
runlocal git ls-remote u1:bar/u1/try4
|
|
runremote ls -al $TEST_BASE/bar/u1/try4.git/git-daemon-export-ok
|
|
expect "ls: cannot access $TEST_BASE/bar/u1/try4.git/git-daemon-export-ok: No such file or directory"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 32 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 44 .* projects.list"
|
|
runremote cat projects.list
|
|
expect "bar/u1/try4.git"
|
|
|
|
name "add default both access"
|
|
echo "\$GL_WILDREPOS_DEFPERMS = 'R daemon gitweb';" | addrc
|
|
|
|
runlocal git ls-remote u1:bar/u1/try5
|
|
runremote ls -al $TEST_BASE/bar/u1/try5.git/git-daemon-export-ok
|
|
expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try5.git/git-daemon-export-ok"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 48 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
|
|
runremote cat projects.list
|
|
expect "bar/u1/try5.git"
|
|
|
|
name "add default both access with @all also"
|
|
echo "\$GL_WILDREPOS_DEFPERMS = 'R @all daemon gitweb';" | addrc
|
|
|
|
runlocal git ls-remote u1:bar/u1/try6
|
|
runremote ls -al $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok
|
|
expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 64 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 76 .* projects.list"
|
|
runremote cat projects.list
|
|
expect "bar/u1/try6.git"
|
|
|
|
name "remove all from u6"
|
|
< /dev/null runlocal ssh u1 setperms bar/u1/try6
|
|
|
|
runlocal git ls-remote u1:bar/u1/try6
|
|
runremote ls -al $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok
|
|
expect "ls: cannot access $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok: No such file or directory"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 48 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
|
|
runremote cat projects.list
|
|
notexpect "bar/u1/try6.git"
|
|
|
|
name "set default access to @all only"
|
|
echo "\$GL_WILDREPOS_DEFPERMS = 'R @all';" | addrc
|
|
|
|
runlocal git ls-remote u1:bar/u1/try7
|
|
runremote ls -al $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok
|
|
[ "$ais" = "0" ] && expect "ls: cannot access $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok: No such file or directory"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 48 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 76 .* projects.list"
|
|
runremote cat projects.list
|
|
[ "$ais" = "0" ] && notexpect "bar/u1/try7.git"
|
|
[ "$ais" = "1" ] && expect "bar/u1/try7.git"
|
|
|
|
name "set default access to daemon only"
|
|
echo "\$GL_WILDREPOS_DEFPERMS = 'R daemon';" | addrc
|
|
|
|
runlocal git ls-remote u1:bar/u1/try8
|
|
runremote ls -al $TEST_BASE/bar/u1/try8.git/git-daemon-export-ok
|
|
expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try8.git/git-daemon-export-ok"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 48 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 76 .* projects.list"
|
|
runremote cat projects.list
|
|
notexpect "bar/u1/try8.git"
|
|
|
|
name "set default access to gitweb only"
|
|
echo "\$GL_WILDREPOS_DEFPERMS = 'R gitweb';" | addrc
|
|
|
|
runlocal git ls-remote u1:bar/u1/try9
|
|
runremote ls -al $TEST_BASE/bar/u1/try9.git/git-daemon-export-ok
|
|
expect "ls: cannot access $TEST_BASE/bar/u1/try9.git/git-daemon-export-ok: No such file or directory"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 64 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 92 .* projects.list"
|
|
runremote cat projects.list
|
|
expect "bar/u1/try9.git"
|
|
|
|
name "INTERNAL"
|
|
|
|
done
|
|
done
|