(test suite) changes in test suite due to upgrading to F17

- git version bumps up, causes minor change in t/merge-check.t
  - for some strange reason apache cannot see /tmp/gitolite-http-authuserfile
    (I thought private /tmp was only if you enabled selinux...)
redis
Sitaram Chamarty 2012-06-08 17:08:15 +05:30
parent 8e15d3a510
commit cd37fe7c36
2 changed files with 5 additions and 4 deletions

View File

@ -34,7 +34,7 @@ try "
try "
cd foo; ok
ls -Al; ok; /\.git/
test-commit aa; ok; /1 files changed, 1 insertions/
test-commit aa; ok; /1 file changed, 1 insertion/
tag start; ok
glt push u1 origin master
ok; /new branch.*master.-..master/

View File

@ -68,13 +68,14 @@ SetEnv GIT_HTTP_EXPORT_ALL
AuthType Basic
AuthName "Private Git Access"
Require valid-user
AuthUserFile /tmp/gitolite-http-authuserfile
AuthUserFile $GITOLITE_HTTP_HOME/gitolite-http-authuserfile
</Location>
EOF1
# NOTE: this is for testing only
htpasswd -bc /tmp/gitolite-http-authuserfile admin admin
map "htpasswd -b /tmp/gitolite-http-authuserfile % %" u{1..6}
htpasswd -bc $GITOLITE_HTTP_HOME/gitolite-http-authuserfile admin admin
map "htpasswd -b $GITOLITE_HTTP_HOME/gitolite-http-authuserfile % %" u{1..6}
chown apache.apache $GITOLITE_HTTP_HOME/gitolite-http-authuserfile
# restart httpd to make it pick up all the new stuff
service httpd restart