From 5a04c66e1fe60ff9d6dddb39823cc11f8bd6d7a3 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 17 May 2021 17:59:01 +0100
Subject: [PATCH] apitest: Move ok printing to end of main (portmanteau) main

This means it happens for wdt too - fine.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 apitest/apitest.rs  |  1 +
 apitest/at-otter.rs | 29 +++++++++++++----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/apitest/apitest.rs b/apitest/apitest.rs
index 06799fad..9a0886a6 100644
--- a/apitest/apitest.rs
+++ b/apitest/apitest.rs
@@ -1075,4 +1075,5 @@ pub fn portmanteau_main(prefix: &str){
     .expect("unrecognosed {wdt,at}-* portanteau member");
 
   f()?;
+  info!("ok");
 }
diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index 412faf23..f5cb71e7 100644
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -778,20 +778,17 @@ fn tests(mut c: Ctx) {
 
 #[throws(Explode)]
 pub fn main() {
-  {
-    let (opts, _instance, su) = setup_core(
-      &[module_path!()],
-    )?;
-    let spec = su.ds.game_spec_data()?;
-    let mut mc = su.mgmt_conn();
-    let [alice, bob]: [Player; 2] =
-      su.ds.setup_static_users(&mut mc, default())?
-      .into_iter().map(|sus| Player { nick: sus.nick, url: sus.url })
-      .collect::<ArrayVec<_>>().into_inner().unwrap();
-    drop(mc);
-    
-    let su_rc = Rc::new(RefCell::new(su));
-    tests(Ctx { opts, spec, su_rc, alice, bob, prctx: default() })?;
-  }
-  info!("ok");
+  let (opts, _instance, su) = setup_core(
+    &[module_path!()],
+  )?;
+  let spec = su.ds.game_spec_data()?;
+  let mut mc = su.mgmt_conn();
+  let [alice, bob]: [Player; 2] =
+    su.ds.setup_static_users(&mut mc, default())?
+    .into_iter().map(|sus| Player { nick: sus.nick, url: sus.url })
+    .collect::<ArrayVec<_>>().into_inner().unwrap();
+  drop(mc);
+
+  let su_rc = Rc::new(RefCell::new(su));
+  tests(Ctx { opts, spec, su_rc, alice, bob, prctx: default() })?;
 }
-- 
2.30.2