From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 30 Jan 2021 01:13:18 +0000 (+0000)
Subject: wdt: Tidy up test selection etc.
X-Git-Tag: otter-0.4.0~628
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ff44f5fd99bf39198d0f44c1961cb3dd70cd4e13;p=otter.git

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 3e64e2df..ee832335 100644
--- 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 9f44d455..b2878c91 100644
--- 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");
   }