@matheusbsbs / matheus-bagliano / commits / ab35469de0
Fork 0

t9501: Re-fix max load test

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>

Brian Gernhardt committed Feb 6, 2010 at 09:50 UTC ab35469de0d2d2ba4be58fd0231687ddc9cc3cdc
1 file changed +2 -9
t/t9501-gitweb-standalone-http-status.sh
+2 -9
@@ -115,19 +115,12 @@ test_debug 'cat gitweb.output'
115 # ----------------------------------------------------------------------
116 # load checking
117
118 -if test -e /proc/loadavg
119 -then
120 - test_set_prereq PROC_LOADAVG
121 -else
122 - say 'skipping load tests (no /proc/loadavg found)'
123 -fi
124 -
118 # always hit the load limit
119 cat >>gitweb_config.perl <<\EOF
127 -our $maxload = 0;
120 +our $maxload = -1;
121 EOF
122
130 -test_expect_success PROC_LOADAVG 'load checking: load too high (default action)' '
123 +test_expect_success 'load checking: load too high (default action)' '
124 gitweb_run "p=.git" &&
125 grep "Status: 503 Service Unavailable" gitweb.headers &&
126 grep "503 - The load average on the server is too high" gitweb.body