diff --git a/ci/static-checks.sh b/ci/static-checks.sh index f2e5f8ca74..dce456a1be 100755 --- a/ci/static-checks.sh +++ b/ci/static-checks.sh @@ -9,5 +9,4 @@ set -e cidir=$(dirname "$0") source "${cidir}/lib.sh" -cd ${TRAVIS_BUILD_DIR}/src/agent run_static_checks diff --git a/src/agent/src/config.rs b/src/agent/src/config.rs index 13d4396bde..f79f86fba7 100644 --- a/src/agent/src/config.rs +++ b/src/agent/src/config.rs @@ -138,8 +138,8 @@ mod tests { use super::*; use std::fs::File; use std::io::Write; - use tempfile::tempdir; use std::time; + use tempfile::tempdir; const ERR_INVALID_LOG_LEVEL: &str = "invalid log level"; const ERR_INVALID_LOG_LEVEL_PARAM: &str = "invalid log level parameter"; diff --git a/src/agent/src/device.rs b/src/agent/src/device.rs index 29110ffb5a..9ef45d3b21 100644 --- a/src/agent/src/device.rs +++ b/src/agent/src/device.rs @@ -13,11 +13,9 @@ use std::path::Path; use std::sync::mpsc; use std::sync::{Arc, Mutex}; -use crate::mount::{ - DRIVERBLKTYPE, DRIVERMMIOBLKTYPE, DRIVERNVDIMMTYPE, DRIVERSCSITYPE, -}; +use crate::mount::{DRIVERBLKTYPE, DRIVERMMIOBLKTYPE, DRIVERNVDIMMTYPE, DRIVERSCSITYPE}; use crate::sandbox::Sandbox; -use crate::{GLOBAL_DEVICE_WATCHER, AGENT_CONFIG}; +use crate::{AGENT_CONFIG, GLOBAL_DEVICE_WATCHER}; use protocols::agent::Device; use protocols::oci::Spec; diff --git a/src/agent/src/main.rs b/src/agent/src/main.rs index 6850f357c9..fa1b3181fa 100644 --- a/src/agent/src/main.rs +++ b/src/agent/src/main.rs @@ -51,9 +51,10 @@ pub mod netlink; mod network; pub mod random; mod sandbox; +#[cfg(test)] +mod test_utils; mod uevent; mod version; -#[cfg(test)] mod test_utils; use mount::{cgroups_mount, general_mount}; use sandbox::Sandbox; @@ -71,7 +72,8 @@ const CONSOLE_PATH: &'static str = "/dev/console"; lazy_static! { static ref GLOBAL_DEVICE_WATCHER: Arc>>> = Arc::new(Mutex::new(HashMap::new())); - static ref AGENT_CONFIG: Arc> = Arc::new(RwLock::new(config::agentConfig::new())); + static ref AGENT_CONFIG: Arc> = + Arc::new(RwLock::new(config::agentConfig::new())); } use std::mem::MaybeUninit; @@ -299,12 +301,12 @@ lazy_static! { // pub static mut LOG_LEVEL: ; // pub static mut TRACE_MODE: ; +use crate::config::agentConfig; use nix::fcntl::{self, OFlag}; use nix::sys::stat::Mode; use std::os::unix::io::{FromRawFd, RawFd}; use std::path::PathBuf; use std::process::{Command, Stdio}; -use crate::config::agentConfig; fn setup_debug_console(shells: Vec) -> Result<()> { for shell in shells.iter() { diff --git a/src/agent/src/mount.rs b/src/agent/src/mount.rs index 7c22c87fc6..c3212096a6 100644 --- a/src/agent/src/mount.rs +++ b/src/agent/src/mount.rs @@ -600,7 +600,7 @@ pub fn get_cgroup_mounts(logger: &Logger, cg_path: &str) -> Result) -> HashMap { #[cfg(test)] mod tests { use super::*; + use crate::{skip_if_not_root, skip_loop_if_not_root, skip_loop_if_root}; use libc::umount; use std::fs::File; use std::fs::OpenOptions; use std::io::Write; use std::path::PathBuf; use tempfile::tempdir; - use crate::{ - skip_if_not_root, - skip_loop_if_not_root, - skip_loop_if_root, - }; #[derive(Debug, PartialEq)] enum TestUserType {