From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 22 Feb 2021 00:20:42 +0000 (+0000)
Subject: tests: Fix want_test api
X-Git-Tag: otter-0.4.0~381
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8b8c1e836f50138a2bb319f49a340acae31bfcd4;p=otter.git

tests: Fix want_test api

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

diff --git a/apitest.rs b/apitest.rs
index 16d43a7b..3c23c47a 100644
--- 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 3f753eb4..0f5a4224 100644
--- 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 {