github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-24 14:32:33 +00:00
Code Issues Projects Releases Wiki Activity

agent/mount: Remove unused ensure_destination_exists()

Browse Source 
The only remaining callers of ensure_destination_exists() are in its own
unit tests.  So, just remove it.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2021-08-11 15:25:01 +10:00
parent 64aa562355
commit 9d3cd9841f
1 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/agent/src/mount.rs
View File

@ -787,21 +787,6 @@ fn ensure_destination_file_exists(path: &Path) -> Result<()> {
Ok(()) Ok(())
} }
// ensure_destination_exists will recursively create a given mountpoint. If directories
// are created, their permissions are initialized to mountPerm(0755)
#[instrument]
fn ensure_destination_exists(destination: &str, fs_type: &str) -> Result<()> {
let d = Path::new(destination);
if fs_type != "bind" || d.is_dir() {
fs::create_dir_all(d).context(format!("create dir all {:?}", d))?;
} else {
ensure_destination_file_exists(d)?;
}
Ok(())
}
#[instrument] #[instrument]
fn parse_options(option_list: Vec<String>) -> HashMap<String, String> { fn parse_options(option_list: Vec<String>) -> HashMap<String, String> {
let mut options = HashMap::new(); let mut options = HashMap::new();
@ -821,7 +806,6 @@ fn parse_options(option_list: Vec<String>) -> HashMap<String, String> {
mod tests { mod tests {
use super::*; use super::*;
use crate::{skip_if_not_root, skip_loop_if_not_root, skip_loop_if_root}; use crate::{skip_if_not_root, skip_loop_if_not_root, skip_loop_if_root};
use std::fs::metadata;
use std::fs::File; use std::fs::File;
use std::fs::OpenOptions; use std::fs::OpenOptions;
use std::io::Write; use std::io::Write;
@ -1401,38 +1385,4 @@ mod tests {
assert!(testfile.is_file()); assert!(testfile.is_file());
} }
#[test]
fn test_ensure_destination_exists() {
let dir = tempdir().expect("failed to create tmpdir");
let mut testfile = dir.into_path();
testfile.push("testfile");
let result = ensure_destination_exists(testfile.to_str().unwrap(), "bind");
assert!(result.is_ok());
assert!(testfile.exists());
let result = ensure_destination_exists(testfile.to_str().unwrap(), "bind");
assert!(result.is_ok());
let meta = metadata(testfile).unwrap();
assert!(meta.is_file());
let dir = tempdir().expect("failed to create tmpdir");
let mut testdir = dir.into_path();
testdir.push("testdir");
let result = ensure_destination_exists(testdir.to_str().unwrap(), "ext4");
assert!(result.is_ok());
assert!(testdir.exists());
let result = ensure_destination_exists(testdir.to_str().unwrap(), "ext4");
assert!(result.is_ok());
//let meta = metadata(testdir.to_str().unwrap()).unwrap();
let meta = metadata(testdir).unwrap();
assert!(meta.is_dir());
}
} }