apitest: Move bundles test to at-bundles

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

diff --git a/apitest/at-bundles.rs b/apitest/at-bundles.rs
index 3fd377860ec5bc92d568f169b48ea927b7d23a06..cc7123da205490bd22df14ba42f2e1d719b3601d 100644 (file)
--- a/apitest/at-bundles.rs
+++ b/apitest/at-bundles.rs
@@ -7,10 +7,38 @@ use crate::*;
 type Ctx = UsualCtx;
 
 impl Ctx {
+  #[throws(Explode)]
+  fn bundles(&mut self) {
+    let bundle_file = self.su().ds.example_bundle();
+    let ds = self.su().ds.also(&[("bundle", &bundle_file)]);
+    self.otter(&ds.ss("upload-bundle @table@ @bundle@")?)?;
+    let mut bundles = self.otter(&ds.ss("list-bundles @table@")?)?;
+    let bundles = String::from(&mut bundles);
+    assert!(bundles.starts_with("00000.zip Loaded"));
+    self.otter(&ds.ss("download-bundle @table@ 0")?)?;
+    let st = Command::new("cmp").args(&[&bundle_file, "00000.zip"]).status()?;
+    if ! st.success() { panic!("cmp failed {}", st) }
+
+    let command = ds.ss("library-add --lib lemon @table@ example-lemon")?;
+    let added = self.some_library_add(&command)?;
+    assert_eq!( added.len(), 1 );
+
+    let output: String = self.otter(&ds.ss("list-pieces @table@")?)?.into();
+    assert!( Regex::new(
+      r#"(?m)(?:[^\w-]|^)example-lemon[^\w-].*\Wa lemon(?:\W|$)"#
+    )?
+             .find(&output)
+             .is_some(),
+             "got: {}", &output);
+
+    self.otter(&ds.ss("clear-game @table@")?)?;
+    self.otter(&ds.ss("reset @table@ demo")?)?;
+  }
 }
 
 #[throws(Explode)]
-fn tests(_c: Ctx) {
+fn tests(mut c: Ctx) {
+  test!(c, "bundles",                       c.bundles()      ?);
 }
 
 #[throws(Explode)]

diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index fd30821d339ce93e2f5f9230405daccec9c24920..f776b8054d022d12488258edf6147b1e56703c4f 100644 (file)
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -190,34 +190,6 @@ impl Ctx {
     su.ds.setup_static_users(&mut *su.mgmt_conn.borrow_mut(), default())?;
   }
 
-  #[throws(Explode)]
-  fn bundles(&mut self) {
-    let bundle_file = self.su().ds.example_bundle();
-    let ds = self.su().ds.also(&[("bundle", &bundle_file)]);
-    self.otter(&ds.ss("upload-bundle @table@ @bundle@")?)?;
-    let mut bundles = self.otter(&ds.ss("list-bundles @table@")?)?;
-    let bundles = String::from(&mut bundles);
-    assert!(bundles.starts_with("00000.zip Loaded"));
-    self.otter(&ds.ss("download-bundle @table@ 0")?)?;
-    let st = Command::new("cmp").args(&[&bundle_file, "00000.zip"]).status()?;
-    if ! st.success() { panic!("cmp failed {}", st) }
-
-    let command = ds.ss("library-add --lib lemon @table@ example-lemon")?;
-    let added = self.some_library_add(&command)?;
-    assert_eq!( added.len(), 1 );
-
-    let output: String = self.otter(&ds.ss("list-pieces @table@")?)?.into();
-    assert!( Regex::new(
-      r#"(?m)(?:[^\w-]|^)example-lemon[^\w-].*\Wa lemon(?:\W|$)"#
-    )?
-             .find(&output)
-             .is_some(),
-             "got: {}", &output);
-
-    self.otter(&ds.ss("clear-game @table@")?)?;
-    self.otter(&ds.ss("reset @table@ demo")?)?;
-  }
-
   #[throws(Explode)]
   fn save_load(&mut self) {
     {
@@ -241,7 +213,6 @@ fn tests(mut c: Ctx) {
   test!(c, "hidden-hand",                   c.hidden_hand()  ?);
   test!(c, "specs",        c.chdir_root(|c| c.specs()        ));
   test!(c, "put-back",                      c.put_back()     ?);
-  test!(c, "bundles",                       c.bundles()      ?);
   test!(c, "save-load",                     c.save_load()    ?);
 }