wdt: Improve/fix some JS logging

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

diff --git a/apitest/apitest.rs b/apitest/apitest.rs
index 211ef5b50e6b23e99e182b249168344b02f409c4..03e2a235d5a2635446a115cccf3ade4e82efdbc8 100644 (file)
--- a/apitest/apitest.rs
+++ b/apitest/apitest.rs
@@ -858,7 +858,7 @@ pub fn setup_core<O>(module_paths: &[&str], early_args: EarlyArgPredicate) ->
   }
 
   builder
-    .filter_level(log::LevelFilter::Info)
+    .filter_level(log::LevelFilter::Debug)
     .parse_env("OTTER_TEST_LOG")
     .init();
   debug!("starting");

diff --git a/wdriver/wdriver.rs b/wdriver/wdriver.rs
index 4492425fbcbd4a91a6c5e57a1e77a63f9c1d7db2..2e54e4e58f8d4894051229e1f7583e6328b7c304 100644 (file)
--- a/wdriver/wdriver.rs
+++ b/wdriver/wdriver.rs
@@ -161,7 +161,7 @@ fn fetch_log(driver: &T4d, name: &str) {
     for ent in got.value().as_array()
       .ok_or(anyhow!("saved isn't an array?"))?
     {
-      #[derive(Deserialize)]
+      #[derive(Deserialize,Debug)]
       struct LogEnt(String, Vec<JsV>);
       impl fmt::Display for LogEnt {
         #[throws(fmt::Error)]
@@ -312,6 +312,10 @@ impl<'g> WindowGuard<'g> {
     log
   }
 
+  #[throws(AE)]
+  pub fn fetch_js_log(&self) {
+    fetch_log(&self.su.driver, &self.w.name)?
+  }
 }
 
 #[ext(pub)]