From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 17 May 2021 23:45:58 +0000 (+0100)
Subject: apitest: Fold placing markers into some_library_add
X-Git-Tag: otter-0.6.0~172
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=811ad64d3a7a82810944ce31ad5c14aa0e99883b;p=otter.git

apitest: Fold placing markers into some_library_add

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

diff --git a/apitest/main.rs b/apitest/main.rs
index d55622d7..e447681d 100644
--- a/apitest/main.rs
+++ b/apitest/main.rs
@@ -494,7 +494,12 @@ impl UsualCtx {
   }
 
   #[throws(Explode)]
-  fn place_library_load_markers(&mut self) -> Session {
+  fn some_library_add(&mut self, command: &[String]) -> Vec<String> {
+    let add_err = self.otter(command)
+      .expect_err("library-add succeeded after reset!");
+    assert_eq!(add_err.downcast::<ExitStatusError>()?.0.code(),
+               Some(EXIT_NOTFOUND));
+
     let mut session = self.connect_player(&self.alice)?;
     let pieces = session.pieces::<PIA>()?;
     let llm = pieces.into_iter()
@@ -509,17 +514,6 @@ impl UsualCtx {
     }
 
     session.synch()?;
-    session
-  }
-
-  #[throws(Explode)]
-  fn some_library_add(&mut self, command: &[String]) -> Vec<String> {
-    let add_err = self.otter(command)
-      .expect_err("library-add succeeded after reset!");
-    assert_eq!(add_err.downcast::<ExitStatusError>()?.0.code(),
-               Some(EXIT_NOTFOUND));
-
-    let mut session = self.place_library_load_markers()?;
 
     self.otter(&command)
       .expect("library-add failed after place!");