Permalink
Browse files

(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...)
  • Loading branch information...
1 parent 8e15d3a commit cd37fe7c36f3d883153dace3844d1edd4f5cadf5 @sitaramc committed Jun 8, 2012
Showing with 5 additions and 4 deletions.
  1. +1 −1 t/merge-check.t
  2. +4 −3 t/smart-http.root-setup
View
@@ -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
@@ -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

0 comments on commit cd37fe7

Please sign in to comment.