From ef021ee2934b8b0d1233a93c521934115f0653eb Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Sun, 11 Mar 2012 16:24:00 +0530 Subject: [PATCH] (test) forgot to set user.email/name to the standard value caused old test scripts to fail (wherever I was checking the actual SHA anyway) --- src/Gitolite/Test.pm | 4 +++- t/basic.t | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/Gitolite/Test.pm b/src/Gitolite/Test.pm index 0e15181..f950fb3 100644 --- a/src/Gitolite/Test.pm +++ b/src/Gitolite/Test.pm @@ -37,7 +37,7 @@ try " 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 CHECK_SETUP = CS_1; git log; ok; /65a1b2acd78dd9a7a401fe81c25380c1ca90067c/ + DEF CHECK_SETUP = CS_1; git log; ok; /6b18ec2ab0f765122ec133959b36c57f77d4565c/ DEF CLONE = glt clone DEF PUSH = glt push @@ -46,6 +46,8 @@ try " mkdir -p $ENV{HOME}/bin ln -sf $ENV{PWD}/src/gitolite $ENV{PWD}/t/glt ~/bin cd; rm -vrf .gito* gito* repositories + git config --global user.name \"gitolite tester\" + git config --global user.email \"tester\@example.com\" # setup gitolite setup -a admin diff --git a/t/basic.t b/t/basic.t index 8b1aa7c..fddc342 100755 --- a/t/basic.t +++ b/t/basic.t @@ -81,7 +81,7 @@ try " cd t1; ok; # push - test-commit tc1 tc2 tc2; ok; /f7153e3/ + test-commit tc1 tc2 tc2; ok; /a530e66/ PUSH u2 origin; !ok; gsh /DENIED by fallthru/ /fatal: The remote end hung up unexpectedly/ @@ -89,15 +89,15 @@ try " /master -> master/ # rewind - reset-h HEAD^; ok; /HEAD is now at 537f964 tc2/ - test-tick; test-commit tc3; ok; /a691552/ + reset-h HEAD^; ok; /HEAD is now at aa2b5c5 tc2/ + test-tick; test-commit tc3; ok; /3ffced1/ PUSH u3 origin; !ok; gsh /rejected.*master -> master.*non-fast-forward./ PUSH u3 -f origin; !ok; gsh reject /DENIED by fallthru/ PUSH u4 origin +master; ok; gsh - / \\+ f7153e3...a691552 master -> master.*forced update./ + / \\+ a530e66...3ffced1 master -> master.*forced update./ "; put "../gitolite-admin/conf/gitolite.conf", " @@ -146,7 +146,7 @@ try " test-commit r1; ok PUSH u1 origin +master; ok; gsh /To file://aa/ - /\\+ cecf671...70469f5 master -> master .forced update./ + /\\+ 27ed463...05adfb0 master -> master .forced update./ # u2 rewind master !ok reset-h HEAD^; ok @@ -160,13 +160,13 @@ try " test-commit r3; ok PUSH u3 origin +master; ok; gsh /To file://aa/ - /\\+ 70469f5...f1e6821 master -> master .forced update./ + /\\+ 05adfb0...6a532fe master -> master .forced update./ # u4 push master ok test-commit u4; ok PUSH u4 origin master; ok; gsh /To file://aa/ - /f1e6821..d308cfb +master -> master/ + /6a532fe..f929773 +master -> master/ # u4 rewind master !ok reset-h HEAD^; ok @@ -191,7 +191,7 @@ try " # clean up for next set PUSH u1 -f origin master dev foo ok; gsh - /d308cfb...f1e6821 master -> master .forced update./ + /f929773...6a532fe master -> master .forced update./ /new branch.*dev -> dev/ /new branch.*foo -> foo/ @@ -204,7 +204,7 @@ try " # u5 rewind dev ok PUSH u5 origin +dev^:dev ok; gsh - /\\+ cecf671...5c8a89d dev\\^ -> dev .forced update./ + /\\+ 27ed463...1ad477a dev\\^ -> dev .forced update./ # u5 rewind foo !ok @@ -219,7 +219,7 @@ try " test-commit u5 PUSH u5 origin foo; ok; gsh - /cecf671..b27cf19 *foo -> foo/ + /27ed463..83da62c *foo -> foo/ # u1 delete dev ok PUSH u1 origin :dev; ok; gsh