From 9fe5e51ad026d6921e8fbd2a6965667d258d1614 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 4 Jan 2021 00:42:39 +0000 Subject: [PATCH] wip links, new test fails Signed-off-by: Ian Jackson --- wdriver/wdt-altergame.rs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/wdriver/wdt-altergame.rs b/wdriver/wdt-altergame.rs index 7826d887..ab73681e 100644 --- a/wdriver/wdt-altergame.rs +++ b/wdriver/wdt-altergame.rs @@ -34,17 +34,26 @@ impl Context { } } + #[throws(AE)] + fn otter_table(&mut self, verb: &[&str], args: &[&str]) { + let args : Vec = + ["--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)?; + } + #[throws(AE)] fn test_link(&mut self, kind: LinkKind, desc: &str, url: &str) { - self.su.ds.otter(&["set-link", &self.alice.table(), - &kind.to_string(), url])?; + self.otter_table(&["set-link"], &[&kind.to_string(), url])?; self.check_link(desc, Some(url))?; } #[throws(AE)] fn test_remove_link(&mut self, kind: LinkKind, desc: &str) { - self.su.ds.otter(&["remove-link", &self.alice.table(), - &kind.to_string()])?; + self.otter_table(&["remove-link"], &[&kind.to_string()])?; self.check_link(desc, None)?; } } -- 2.30.2