Skip to content

Commit

Permalink
t9501: Re-fix max load test
Browse files Browse the repository at this point in the history
Revert the previous attempt to skip this test on platforms where we
currently cannot determine the system load.  We want to make sure that
the max-load-limit codepath produces results cleanly, when gitweb is
updated and becomes capable of reading the load average by some other
method.

The code to check for load returns 0 if it doesn't know how to find
load.  It also checks to see if the current load is higher than the
max load.  So to force the script to quit early by setting the maxload
variable negative which should work for systems where we can detect
load (which should be a positive number) and systems where we can't
(where detected load is 0)

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brian Gernhardt authored and Junio C Hamano committed Feb 6, 2010
1 parent 6d0d465 commit ab35469
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions t/t9501-gitweb-standalone-http-status.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,12 @@ test_debug 'cat gitweb.output'
# ----------------------------------------------------------------------
# load checking

if test -e /proc/loadavg
then
test_set_prereq PROC_LOADAVG
else
say 'skipping load tests (no /proc/loadavg found)'
fi

# always hit the load limit
cat >>gitweb_config.perl <<\EOF
our $maxload = 0;
our $maxload = -1;
EOF

test_expect_success PROC_LOADAVG 'load checking: load too high (default action)' '
test_expect_success 'load checking: load too high (default action)' '
gitweb_run "p=.git" &&
grep "Status: 503 Service Unavailable" gitweb.headers &&
grep "503 - The load average on the server is too high" gitweb.body
Expand Down

0 comments on commit ab35469

Please sign in to comment.