deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

(test) forgot to set user.email/name to the standard value

Browse source 
caused old test scripts to fail (wherever I was checking the actual SHA
anyway)
This commit is contained in:
Sitaram Chamarty 2012-03-11 16:24:00 +05:30
parent fb69f6e328
commit ef021ee293
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Gitolite/Test.pm
View file

@ -37,7 +37,7 @@ try "
DEF ADMIN_PUSH = AP_2 %1; glt push admin origin; ok; gsh; /master -> master/ DEF ADMIN_PUSH = AP_2 %1; glt push admin origin; ok; gsh; /master -> master/
DEF CS_1 = pwd; //tmp/tsh_tempdir.*gitolite-admin/; git remote -v; ok; /file://gitolite-admin/ DEF CS_1 = pwd; //tmp/tsh_tempdir.*gitolite-admin/; git remote -v; ok; /file://gitolite-admin/
DEF CHECK_SETUP = CS_1; git log; ok; /65a1b2acd78dd9a7a401fe81c25380c1ca90067c/ DEF CHECK_SETUP = CS_1; git log; ok; /6b18ec2ab0f765122ec133959b36c57f77d4565c/
DEF CLONE = glt clone DEF CLONE = glt clone
DEF PUSH = glt push DEF PUSH = glt push
@ -46,6 +46,8 @@ try "
mkdir -p $ENV{HOME}/bin mkdir -p $ENV{HOME}/bin
ln -sf $ENV{PWD}/src/gitolite $ENV{PWD}/t/glt ~/bin ln -sf $ENV{PWD}/src/gitolite $ENV{PWD}/t/glt ~/bin
cd; rm -vrf .gito* gito* repositories cd; rm -vrf .gito* gito* repositories
git config --global user.name \"gitolite tester\"
git config --global user.email \"tester\@example.com\"
# setup # setup
gitolite setup -a admin gitolite setup -a admin

20
t/basic.t
View file

@ -81,7 +81,7 @@ try "
cd t1; ok; cd t1; ok;
# push # push
test-commit tc1 tc2 tc2; ok; /f7153e3/ test-commit tc1 tc2 tc2; ok; /a530e66/
PUSH u2 origin; !ok; gsh PUSH u2 origin; !ok; gsh
/DENIED by fallthru/ /DENIED by fallthru/
/fatal: The remote end hung up unexpectedly/ /fatal: The remote end hung up unexpectedly/
@ -89,15 +89,15 @@ try "
/master -> master/ /master -> master/
# rewind # rewind
reset-h HEAD^; ok; /HEAD is now at 537f964 tc2/ reset-h HEAD^; ok; /HEAD is now at aa2b5c5 tc2/
test-tick; test-commit tc3; ok; /a691552/ test-tick; test-commit tc3; ok; /3ffced1/
PUSH u3 origin; !ok; gsh PUSH u3 origin; !ok; gsh
/rejected.*master -> master.*non-fast-forward./ /rejected.*master -> master.*non-fast-forward./
PUSH u3 -f origin; !ok; gsh PUSH u3 -f origin; !ok; gsh
reject reject
/DENIED by fallthru/ /DENIED by fallthru/
PUSH u4 origin +master; ok; gsh PUSH u4 origin +master; ok; gsh
/ \\+ f7153e3...a691552 master -> master.*forced update./ / \\+ a530e66...3ffced1 master -> master.*forced update./
"; ";
put "../gitolite-admin/conf/gitolite.conf", " put "../gitolite-admin/conf/gitolite.conf", "
@ -146,7 +146,7 @@ try "
test-commit r1; ok test-commit r1; ok
PUSH u1 origin +master; ok; gsh PUSH u1 origin +master; ok; gsh
/To file://aa/ /To file://aa/
/\\+ cecf671...70469f5 master -> master .forced update./ /\\+ 27ed463...05adfb0 master -> master .forced update./
# u2 rewind master !ok # u2 rewind master !ok
reset-h HEAD^; ok reset-h HEAD^; ok
@ -160,13 +160,13 @@ try "
test-commit r3; ok test-commit r3; ok
PUSH u3 origin +master; ok; gsh PUSH u3 origin +master; ok; gsh
/To file://aa/ /To file://aa/
/\\+ 70469f5...f1e6821 master -> master .forced update./ /\\+ 05adfb0...6a532fe master -> master .forced update./
# u4 push master ok # u4 push master ok
test-commit u4; ok test-commit u4; ok
PUSH u4 origin master; ok; gsh PUSH u4 origin master; ok; gsh
/To file://aa/ /To file://aa/
/f1e6821..d308cfb +master -> master/ /6a532fe..f929773 +master -> master/
# u4 rewind master !ok # u4 rewind master !ok
reset-h HEAD^; ok reset-h HEAD^; ok
@ -191,7 +191,7 @@ try "
# clean up for next set # clean up for next set
PUSH u1 -f origin master dev foo PUSH u1 -f origin master dev foo
ok; gsh ok; gsh
/d308cfb...f1e6821 master -> master .forced update./ /f929773...6a532fe master -> master .forced update./
/new branch.*dev -> dev/ /new branch.*dev -> dev/
/new branch.*foo -> foo/ /new branch.*foo -> foo/
@ -204,7 +204,7 @@ try "
# u5 rewind dev ok # u5 rewind dev ok
PUSH u5 origin +dev^:dev PUSH u5 origin +dev^:dev
ok; gsh ok; gsh
/\\+ cecf671...5c8a89d dev\\^ -> dev .forced update./ /\\+ 27ed463...1ad477a dev\\^ -> dev .forced update./
# u5 rewind foo !ok # u5 rewind foo !ok
@ -219,7 +219,7 @@ try "
test-commit u5 test-commit u5
PUSH u5 origin foo; ok; gsh PUSH u5 origin foo; ok; gsh
/cecf671..b27cf19 *foo -> foo/ /27ed463..83da62c *foo -> foo/
# u1 delete dev ok # u1 delete dev ok
PUSH u1 origin :dev; ok; gsh PUSH u1 origin :dev; ok; gsh