提交 2ae48a9b 编写于 作者: J Junio C Hamano

Merge branch 'rj/gitweb-test-sans-date-parser'

Regression fix to t9501 introduced at 0f3ddd4a

* rj/gitweb-test-sans-date-parser:
  gitweb: Skip 'modification times' tests when no date parser available
...@@ -12,6 +12,13 @@ code and message.' ...@@ -12,6 +12,13 @@ code and message.'
. ./gitweb-lib.sh . ./gitweb-lib.sh
#
# Gitweb only provides the functionality tested by the 'modification times'
# tests if it can access a date parser from one of these modules:
#
perl -MHTTP::Date -e 0 >/dev/null 2>&1 && test_set_prereq DATE_PARSER
perl -MTime::ParseDate -e 0 >/dev/null 2>&1 && test_set_prereq DATE_PARSER
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# snapshot settings # snapshot settings
...@@ -115,14 +122,14 @@ test_debug 'cat gitweb.output' ...@@ -115,14 +122,14 @@ test_debug 'cat gitweb.output'
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# modification times (Last-Modified and If-Modified-Since) # modification times (Last-Modified and If-Modified-Since)
test_expect_success 'modification: feed last-modified' ' test_expect_success DATE_PARSER 'modification: feed last-modified' '
gitweb_run "p=.git;a=atom;h=master" && gitweb_run "p=.git;a=atom;h=master" &&
grep "Status: 200 OK" gitweb.headers && grep "Status: 200 OK" gitweb.headers &&
grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
' '
test_debug 'cat gitweb.headers' test_debug 'cat gitweb.headers'
test_expect_success 'modification: feed if-modified-since (modified)' ' test_expect_success DATE_PARSER 'modification: feed if-modified-since (modified)' '
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" && export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" && test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
gitweb_run "p=.git;a=atom;h=master" && gitweb_run "p=.git;a=atom;h=master" &&
...@@ -130,7 +137,7 @@ test_expect_success 'modification: feed if-modified-since (modified)' ' ...@@ -130,7 +137,7 @@ test_expect_success 'modification: feed if-modified-since (modified)' '
' '
test_debug 'cat gitweb.headers' test_debug 'cat gitweb.headers'
test_expect_success 'modification: feed if-modified-since (unmodified)' ' test_expect_success DATE_PARSER 'modification: feed if-modified-since (unmodified)' '
export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" && export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" && test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
gitweb_run "p=.git;a=atom;h=master" && gitweb_run "p=.git;a=atom;h=master" &&
...@@ -138,14 +145,14 @@ test_expect_success 'modification: feed if-modified-since (unmodified)' ' ...@@ -138,14 +145,14 @@ test_expect_success 'modification: feed if-modified-since (unmodified)' '
' '
test_debug 'cat gitweb.headers' test_debug 'cat gitweb.headers'
test_expect_success 'modification: snapshot last-modified' ' test_expect_success DATE_PARSER 'modification: snapshot last-modified' '
gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" && gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
grep "Status: 200 OK" gitweb.headers && grep "Status: 200 OK" gitweb.headers &&
grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
' '
test_debug 'cat gitweb.headers' test_debug 'cat gitweb.headers'
test_expect_success 'modification: snapshot if-modified-since (modified)' ' test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (modified)' '
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" && export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" && test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" && gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
...@@ -153,7 +160,7 @@ test_expect_success 'modification: snapshot if-modified-since (modified)' ' ...@@ -153,7 +160,7 @@ test_expect_success 'modification: snapshot if-modified-since (modified)' '
' '
test_debug 'cat gitweb.headers' test_debug 'cat gitweb.headers'
test_expect_success 'modification: snapshot if-modified-since (unmodified)' ' test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (unmodified)' '
export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" && export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" && test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" && gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
...@@ -161,7 +168,7 @@ test_expect_success 'modification: snapshot if-modified-since (unmodified)' ' ...@@ -161,7 +168,7 @@ test_expect_success 'modification: snapshot if-modified-since (unmodified)' '
' '
test_debug 'cat gitweb.headers' test_debug 'cat gitweb.headers'
test_expect_success 'modification: tree snapshot' ' test_expect_success DATE_PARSER 'modification: tree snapshot' '
ID=`git rev-parse --verify HEAD^{tree}` && ID=`git rev-parse --verify HEAD^{tree}` &&
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" && export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" && test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册