From dc61fadca5a52294e23bbc817eeae8913a8a17dd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 18 May 2021 01:53:07 +0100 Subject: [PATCH] apitest: bundles: Abstract over bundle name Signed-off-by: Ian Jackson --- apitest/at-bundles.rs | 4 +++- apitest/main.rs | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apitest/at-bundles.rs b/apitest/at-bundles.rs index 217fe094..10c4ceca 100644 --- 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 7ef77d2c..5938b8c5 100644 --- 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); -- 2.30.2