wdt: Tidy up test selection etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/wdriver.rs b/wdriver.rs
index 3e64e2df3b5e9ed452258a463a95c6e7a03371f9..ee83233598386eac112fca509fd4ec2fde4f92fc 100644 (file)
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -952,11 +952,11 @@ fn check_window_name_sanity(name: &str) -> &str {
 macro_rules! test {
   ($c:expr, $tname:expr, $s:stmt) => {
     if $c.su.want_test($tname) {
-      debug!("{} starting", $tname);
+      debug!("-------------------- {} starting --------------------", $tname);
       $s
-      info!("{} completed", $tname);
+      info!("-------------------- {} completed --------------------", $tname);
     } else {
-      trace!("{} skipped", $tname);
+      trace!("- - - {} skipped - - -", $tname);
     }
   }
 }

diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index 9f44d45555cf43d48130f0e1c3c357eb505e2921..b2878c91f278e1e7706c4d8e7958b0c05d8d5c96 100644 (file)
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -281,7 +281,7 @@ fn main(){
 
     let mut c = Ctx { su, alice, bob, spec };
 
-    test!(c, "drag", c.drag().always_context("drag")?);
+    test!(c, "drag", c.drag()?);
 
     test!(c, "drag-rotate-unselect", {
       let pc = c.rotate().always_context("rotate")?;
@@ -289,7 +289,7 @@ fn main(){
       c.unselect(pc).always_context("unselect")?;
     });
 
-    c.conflict().always_context("conflict handling")?;
+    test!(c, "conflict", c.conflict()?);
 
     debug!("finishing");
   }