prefs tests: Break out ssh_command, ready for adding a test

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

diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index a4f68041dd59f0186a8ae28fc19c1e2c67880dae..646d9794318ab0d1dcdeb93982a29b8f542d8ab6 100644 (file)
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -246,18 +246,23 @@ impl Ctx {
                 .lines().nth(2).unwrap().unwrap(),
                 STATIC_TEST.strip_suffix("\n").unwrap() );
 
+    let ssh_command = ds.subst(
+      "@src@/apitest/mock-ssh-restricted @authkeys@ '@dummy_key_data@'"
+    )?;
+
     let mk_restricted = |account, rhs|{
-      let mut command = ds.also(&[
-        ("account",account),
-        ("rhs",    rhs),
-      ]).gss(
+      let ds = ds.also(&[
+        ("account",      account),
+        ("rhs",          rhs),
+        ("ssh_command", ssh_command.as_str()),
+      ]);
+      let mut command = ds.gss(
         "--account @account@ \
          --ssh nowhere \
          @rhs@"
       )?;
       command.insert(0, ds.subst(
-        "--ssh-command=@src@/apitest/mock-ssh-restricted \
-         @authkeys@ '@dummy_key_data@'"
+        "--ssh-command=@ssh_command@"
       )?);
       Ok::<_,Explode>(command)
     };