tests: Fix want_test api

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

diff --git a/apitest.rs b/apitest.rs
index 16d43a7b2a2d639a62446f8385b0612ef0e6806d..3c23c47aed0627995d1c876a2d9d7bf16fe2da39 100644 (file)
--- a/apitest.rs
+++ b/apitest.rs
@@ -274,7 +274,7 @@ impl Drop for TrackWantedTests {
 #[macro_export]
 macro_rules! test {
   ($c:expr, $tname:expr, $s:stmt) => {
-    if $c.su.want_test($tname) {
+    if $c.su.wanted_tests.wantp($tname) {
       debug!("-------------------- {} starting --------------------", $tname);
       $s
       info!("-------------------- {} completed --------------------", $tname);

diff --git a/wdriver.rs b/wdriver.rs
index 3f753eb42ccb630dfef7571281492fbf104d2cce..0f5a42243f9763b295b16b7e526d5a134fa9b575 100644 (file)
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -351,10 +351,6 @@ fn check_window_name_sanity(name: &str) -> &str {
 }
 
 impl Setup {
-  pub fn want_test(&mut self, tname: &str) -> bool {
-    self.wanted_tests.wantp(tname)
-  }
-
   #[throws(AE)]
   pub fn new_window<'s>(&'s mut self, instance: &Instance, name: &str)
                         -> Window {