Test-name specified in initialise() call rather than check()

[irspy-moved-to-github.git] / web / htdocs / details / check.mc

diff --git a/web/htdocs/details/check.mc b/web/htdocs/details/check.mc
index bf550f9..b2dd433 100644 (file)
--- a/web/htdocs/details/check.mc
+++ b/web/htdocs/details/check.mc
@@ -1,26 +1,48 @@
-%# $Id: check.mc,v 1.4 2006-09-23 07:13:43 mike Exp $
+%# $Id: check.mc,v 1.17 2007-04-18 15:32:43 mike Exp $

 <%args>
 @id
 <%args>
 @id

+$test => "Quick"
+$really => 0

 </%args>
 <%perl>
 my $allTargets = (@id == 1 && $id[0] eq "");
 </%args>
 <%perl>
 my $allTargets = (@id == 1 && $id[0] eq "");

+if ($allTargets && !$really) {
+</%perl>
+     <h2>Warning</h2>
+     <p class="error">
+      Testing all the targets is a very slow process.
+      Are you sure you want to do this?
+     </p>
+     <p>
+      <a href="?really=1&amp;test=Quick">Yes: Quick Test</a><br/>
+      <a href="?really=1&amp;test=Main">Yes: Full Test</a><br/>
+      <a href="/">No</a><br/>
+     </p>
+<%perl>
+} else {
+

 print "<h2>Testing ...</h2>\n";
 print "<h2>Testing ...</h2>\n";

-my $spy = new ZOOM::IRSpy("localhost:3313/IR-Explain---1",
-                         admin => "fruitbat");
-print "     <ul>\n", join("", map { "      <li>$_\n" } @id), "</ul>\n"
+print "     <ul>\n", join("", map { "      <li>$_</li>\n" } @id), "</ul>\n"

     if !$allTargets;
     if !$allTargets;

+$m->flush_buffer();

 
 

-ZOOM::Log::mask_str("irspy,irspy_test"); # Do we need this?
-ZOOM::Log::init_level(ZOOM::Log::module_level("irspy,irspy_test"));
-ZOOM::Log::time_format("%F %T"); # ISO-8601 format
-### Arrange to capture logging output ... somehow.
+# Turning on autoflush with $m->autoflush() doesn't seem to work if
+# even if the "MasonEnableAutoflush" configuration parameter is turned
+# on in the HTTP configuration, so we don't even try -- instead,
+# having ZOOM::IRSpy::Web::log() explicitly calling $m->flush_buffer()

 
 

+my $spy = new ZOOM::IRSpy::Web("localhost:8018/IR-Explain---1",
+                              admin => "fruitbat");
+$spy->log_init_level("irspy,irspy_test");

 $spy->targets(@id) if !$allTargets;
 $spy->targets(@id) if !$allTargets;

-$spy->initialise();
+$spy->initialise($test);

 my $res = $spy->check();
 my $res = $spy->check();

+print "<p>\n";

 if ($res == 0) {
 if ($res == 0) {

-    print "All tests were run\n";
+    print "<b>All tests were attempted</b>\n";

 } else {
 } else {

-    print "Some tests were skipped\n";
+    print "<b>$res tests were skipped</b>\n";
+}
+print "</p>\n";

 }
 </%perl>
 }
 </%perl>