summaryrefslogtreecommitdiff
path: root/subplotlib
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2022-03-06 14:13:51 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2022-03-06 14:13:51 +0000
commitc1a3fea768098119370659b81f3438adfbe63c2b (patch)
treebf546d551c0375061086da700a24a2a59be7edbb /subplotlib
parentfd9d69fe14da08d6b0fef77e0eb589375f48f025 (diff)
downloadsubplot-c1a3fea768098119370659b81f3438adfbe63c2b.tar.gz
(subplotlib): Fix places where we weren't processing Results
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'subplotlib')
-rw-r--r--subplotlib/src/steplibrary/datadir.rs2
-rw-r--r--subplotlib/src/steplibrary/files.rs4
-rw-r--r--subplotlib/src/steplibrary/runcmd.rs4
3 files changed, 5 insertions, 5 deletions
diff --git a/subplotlib/src/steplibrary/datadir.rs b/subplotlib/src/steplibrary/datadir.rs
index 91f5603..e6eadbe 100644
--- a/subplotlib/src/steplibrary/datadir.rs
+++ b/subplotlib/src/steplibrary/datadir.rs
@@ -145,5 +145,5 @@ pub fn datadir_has_enough_space(datadir: &Datadir, bytes: u64) {
/// A convenience step for enough disk space in the data dir in megabytes
#[step]
pub fn datadir_has_enough_space_megabytes(context: &ScenarioContext, megabytes: u64) {
- datadir_has_enough_space::call(context, megabytes * 1024 * 1024)
+ datadir_has_enough_space::call(context, megabytes * 1024 * 1024)?;
}
diff --git a/subplotlib/src/steplibrary/files.rs b/subplotlib/src/steplibrary/files.rs
index a49add1..fd84e1c 100644
--- a/subplotlib/src/steplibrary/files.rs
+++ b/subplotlib/src/steplibrary/files.rs
@@ -50,7 +50,7 @@ impl ContextElement for Files {
#[context(Datadir)]
pub fn create_from_embedded(context: &ScenarioContext, embedded_file: SubplotDataFile) {
let filename_on_disk = format!("{}", embedded_file.name().display());
- create_from_embedded_with_other_name::call(context, &filename_on_disk, embedded_file)
+ create_from_embedded_with_other_name::call(context, &filename_on_disk, embedded_file)?;
}
/// Create a file on disk from an embedded file with a given name
@@ -132,7 +132,7 @@ pub fn remember_metadata(context: &ScenarioContext, filename: &str) {
Ok(())
},
false,
- )
+ )?;
}
/// Touch a given file
diff --git a/subplotlib/src/steplibrary/runcmd.rs b/subplotlib/src/steplibrary/runcmd.rs
index 8ed4f4f..781e789 100644
--- a/subplotlib/src/steplibrary/runcmd.rs
+++ b/subplotlib/src/steplibrary/runcmd.rs
@@ -330,7 +330,7 @@ pub fn exit_code_is_not(context: &Runcmd, exit: i32) {
#[step]
#[context(Runcmd)]
pub fn exit_code_is_zero(context: &ScenarioContext) {
- exit_code_is::call(context, 0)
+ exit_code_is::call(context, 0)?;
}
/// Check that an executed command did not succeed
@@ -341,7 +341,7 @@ pub fn exit_code_is_zero(context: &ScenarioContext) {
#[step]
#[context(Runcmd)]
pub fn exit_code_is_nonzero(context: &ScenarioContext) {
- exit_code_is_not::call(context, 0)
+ exit_code_is_not::call(context, 0)?;
}
enum Stream {