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>

diff --git a/apitest/apitest.rs b/apitest/apitest.rs
index 06799fad53f64665cf6e806c20a41b17a12976f0..9a0886a6b5ecbe12b60f8d73a557e16a7438e631 100644 (file)
--- 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 412faf23fb4d48300d5f7150ebf341906690f6da..f5cb71e7bd2f6c07a0a82b3ea88a853affdf8f19 100644 (file)
--- 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() })?;
 }