wdt: Provide more otter() methods

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

diff --git a/wdriver.rs b/wdriver.rs
index fc3619a1e2f04f4bbdc22f8576a832f3cba3c444..e4e1b2ac8a03e7ccd960d3ff360428fefe9d92d4 100644 (file)
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -914,6 +914,17 @@ impl Setup {
     self.windows_squirreled.push(name.to_owned());
     window
   }
+
+  #[throws(AE)]
+  pub fn otter(&mut self, w: &Window, verb: &[&str], args: &[&str]) {
+    let args : Vec<String> =
+      ["--account", "server:"].iter().cloned().map(Into::into)
+      .chain(verb.iter().cloned().map(Into::into))
+      .chain(iter::once(w.table()))
+      .chain(args.iter().cloned().map(Into::into))
+      .collect();
+    self.ds.otter(&args)?;
+  }
 }
 
 impl Setup {

diff --git a/wdriver/wdt-altergame.rs b/wdriver/wdt-altergame.rs
index e19c0bd2487652c6d795558ec65aa94ee21f30f2..ae8294e7a1f447f8b744e12929a67c8383706aad 100644 (file)
--- a/wdriver/wdt-altergame.rs
+++ b/wdriver/wdt-altergame.rs
@@ -39,20 +39,14 @@ impl Ctx {
   }
 
   #[throws(AE)]
-  fn otter_table(&mut self, verb: &[&str], args: &[&str]) {
-    let args : Vec<String> =
-      ["--account", "server:"].iter().cloned().map(Into::into)
-      .chain(verb.iter().cloned().map(Into::into))
-      .chain(iter::once(self.alice.table()))
-      .chain(args.iter().cloned().map(Into::into))
-      .collect();
-    self.su.ds.otter(&args)?;
+  fn otter(&mut self, verb: &[&str], args: &[&str]) {
+    self.su.otter(&self.alice, verb, args)?
   }
 
   #[throws(AE)]
   fn test_link(&mut self, kind: LinkKind, desc: &'static str, url: &str) {
     (||{
-      self.otter_table(&["set-link"], &[&kind.to_string(), url])?;
+      self.otter(&["set-link"], &[&kind.to_string(), url])?;
       self.check_link(desc, Some(url))?;
       Ok::<_,AE>(())
     })()
@@ -62,7 +56,7 @@ impl Ctx {
   #[throws(AE)]
   fn test_remove_link(&mut self, kind: LinkKind, desc: &'static str) {
     (||{
-      self.otter_table(&["set-link"], &[&kind.to_string(), ""])?;
+      self.otter(&["set-link"], &[&kind.to_string(), ""])?;
       self.check_link(desc, None)?;
       Ok::<_,AE>(())
     })()