[PATCH] t9501: Skip testing load if we can't detect it
- From
Brian Gernhardt <brian@gernhardtsoftware.com>
- Date
- Feb 6, 2010, 05:00 UTC
- Message-ID
- <1265432440-52146-1-git-send-email-brian@gernhardtsoftware.com>
Currently gitweb only knows how to check for load using /proc/loadavg, which isn't available on all systems. We shouldn't fail the test just because we don't know how to check the system load.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> --- t/t9501-gitweb-standalone-http-status.sh | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh index 7590f10..992d729 100755 --- a/t/t9501-gitweb-standalone-http-status.sh +++ b/t/t9501-gitweb-standalone-http-status.sh @@ -115,12 +115,19 @@ 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; EOF -test_expect_success 'load checking: load too high (default action)' ' +test_expect_success PROC_LOADAVG '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
-- 1.7.0.rc1.141.gd3fd2