wip synch etc.

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

diff --git a/wdriver.rs b/wdriver.rs
index aa2fd1f982c1a976b319524303eaa0ac20839d45..1532b0067e64e99e98fd50c40a1cbba716471584 100644 (file)
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -564,6 +564,8 @@ impl DirSubst {
     let mut args : Vec<&str> = vec![];
     args.extend(&["--config", CONFIG]);
     args.extend(xargs.iter().map(AsRef::as_ref));
+    let dbg = format!("running {} {:?}", &exe, &args);
+    debug!("{}", &dbg);
     (||{
       let mut cmd = Command::new(&exe);
       cmd.args(&args);
@@ -575,7 +577,7 @@ impl DirSubst {
       }
       Ok::<_,AE>(())
     })()
-      .context(exe)
+      .context(dbg)
       .context("run otter client")?;
   }
 }
@@ -828,7 +830,7 @@ pub fn setup(exe_module_path: &str) -> (Setup, Instance) {
     prepare_gameserver(&cln, &ds).always_context("setup game server")?;
 
   let instance_name =
-    prepare_game(&ds, "TABLE").context("setup game")?;
+    prepare_game(&ds, TABLE).context("setup game")?;
 
   let final_hook = FinalInfoCollection;
 

diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index 232ba3086bd7375adeb87b111d5573690a1fcdb8..ec94fc26047b268d73ec69c4f37e37df474dcc87 100644 (file)
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -11,7 +11,7 @@ fn main(){
     su.setup_static_users(&inst)?.try_into().unwrap();
   debug!("ok {:?} {:?}", alice, bob);
 
-//  alice.synch()?;
+  su.w(&alice)?.synch()?;
 
   sleep(750 * MS);
   debug!("finishing");