apitest: bundles: Abstract over bundle name

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

diff --git a/apitest/at-bundles.rs b/apitest/at-bundles.rs
index 217fe094a5af25da94dad0d990d53df674af57f0..10c4cecaa2658db20a9fcee10a38546ffa58406b 100644 (file)
--- a/apitest/at-bundles.rs
+++ b/apitest/at-bundles.rs
@@ -9,7 +9,9 @@ type Ctx = UsualCtx;
 impl Ctx {
   #[throws(Explode)]
   fn bundles(&mut self) {
-    self.upload_and_check_bundle("lemon","example-lemon","a lemon")?;
+    self.upload_and_check_bundle(
+      "test-bundle","lemon", "example-lemon","a lemon"
+    )?;
   }
 }
 

diff --git a/apitest/main.rs b/apitest/main.rs
index 7ef77d2cffb468ad7a7969df43d26ae6eddcece5..5938b8c596e1bf732d93199599868d5f6b7e71d4 100644 (file)
--- a/apitest/main.rs
+++ b/apitest/main.rs
@@ -587,12 +587,13 @@ impl UsualCtx {
   }
 
   #[throws(Explode)]
-  pub fn upload_and_check_bundle(&mut self,
+  pub fn upload_and_check_bundle(&mut self, bundle_stem: &str,
                                  libname: &str, item: &str,
                                  desc: &str)
   {
-    let bundle_file = self.su().ds.example_bundle();
-    let ds = self.su().ds.also(&[("bundle", &bundle_file)]);
+    let ds = self.su().ds.also(&[("bundle_stem", &bundle_stem)]);
+    let bundle_file = ds.subst("@examples@/@bundle_stem@.zip")?;
+    let ds = 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);