agent: fix unit tests - remove rustjail::errors

Fix unit tests and use `anyhow::Error`.

Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2020-08-28 14:44:43 -05:00
parent 6c96d66667
commit 8b07bc2c80
3 changed files with 6 additions and 4 deletions

View File

@ -203,6 +203,7 @@ fn get_container_pipe_size(param: &str) -> Result<i32> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use anyhow::Error;
use std::fs::File; use std::fs::File;
use std::io::Write; use std::io::Write;
use std::time; use std::time;
@ -223,7 +224,7 @@ mod tests {
// helper function to make errors less crazy-long // helper function to make errors less crazy-long
fn make_err(desc: &str) -> Error { fn make_err(desc: &str) -> Error {
anyhow!(desc) anyhow!(desc.to_string())
} }
// Parameters: // Parameters:

View File

@ -470,7 +470,7 @@ mod tests {
assert!(result.is_err()); assert!(result.is_err());
assert_eq!( assert_eq!(
result.unwrap_err().to_string(), result.unwrap_err().to_string(),
"Error Code: 'no shell found to launch debug console'" "no shell found to launch debug console"
); );
} }
@ -496,7 +496,7 @@ mod tests {
assert!(result.is_err()); assert!(result.is_err());
assert_eq!( assert_eq!(
result.unwrap_err().to_string(), result.unwrap_err().to_string(),
"Error Code: 'no shell found to launch debug console'" "no shell found to launch debug console"
); );
} }
} }

View File

@ -350,6 +350,7 @@ mod tests {
//use rustjail::Error; //use rustjail::Error;
use super::Sandbox; use super::Sandbox;
use crate::{mount::BareMount, skip_if_not_root}; use crate::{mount::BareMount, skip_if_not_root};
use anyhow::Error;
use nix::mount::MsFlags; use nix::mount::MsFlags;
use oci::{Linux, Root, Spec}; use oci::{Linux, Root, Spec};
use rustjail::container::LinuxContainer; use rustjail::container::LinuxContainer;
@ -359,7 +360,7 @@ mod tests {
use std::os::unix::fs::PermissionsExt; use std::os::unix::fs::PermissionsExt;
use tempfile::Builder; use tempfile::Builder;
fn bind_mount(src: &str, dst: &str, logger: &Logger) -> Result<(), rustjail::errors::Error> { fn bind_mount(src: &str, dst: &str, logger: &Logger) -> Result<(), Error> {
let baremount = BareMount::new(src, dst, "bind", MsFlags::MS_BIND, "", &logger); let baremount = BareMount::new(src, dst, "bind", MsFlags::MS_BIND, "", &logger);
baremount.mount() baremount.mount()
} }