diff --git a/src/Gitolite/Test.pm b/src/Gitolite/Test.pm index c8e1f52..11d1c9d 100644 --- a/src/Gitolite/Test.pm +++ b/src/Gitolite/Test.pm @@ -85,7 +85,7 @@ sub confreset { system("find ~/repositories -name '*.git' |xargs rm -rf"); system("mv ~/repositories/.ga ~/repositories/gitolite-admin.git"); system("mv ~/repositories/.te ~/repositories/testing.git "); - put "conf/gitolite.conf", ' + put "|cut -c9- > conf/gitolite.conf", ' repo gitolite-admin RW+ = admin repo testing diff --git a/t/reset b/t/reset index cfdc3db..fa9bbcf 100755 --- a/t/reset +++ b/t/reset @@ -9,4 +9,25 @@ BEGIN { # this is hardcoded; change it if needed use lib "src"; use Gitolite::Test; -try 'put'; + +use Cwd; +my $workdir = getcwd(); + +confreset;confadd ' + repo foo/..* + C = u1 u2 u3 + RW+ = CREATOR + RW = WRITERS + R = READERS +'; + +try "ADMIN_PUSH set1; !/FATAL/" or die text(); + +try " + mkdir -p keydir + cp \$HOME/.ssh/u*.pub keydir + cp \$HOME/.ssh/admin.pub keydir + git add keydir + git commit -m 6k + glt push admin origin +";