Merge pull request #102 from constreference/tty

Add unit tests for tty module

Cargo.toml

@@ -26,3 +26,4 @@ oci_spec = { version = "0.1.0", path = "./oci_spec" }
 [dev-dependencies]
 oci_spec = { version = "0.1.0", path = "./oci_spec", features = ["proptests"] }
 quickcheck = "1"
+serial_test = "0.5.1"

src/cgroups/test.rs

@@ -2,58 +2,14 @@
 
 use anyhow::Result;
 use std::{
- fs,
- io::Write,
- ops::Deref,
+ io::Write, 
  path::{Path, PathBuf},
 };
 
 use oci_spec::LinuxCpu;
 
-pub struct TempDir {
- path: Option<PathBuf>,
-}
-
-impl TempDir {
- pub fn new<P: Into<PathBuf>>(path: P) -> Result<Self> {
- let p = path.into();
- std::fs::create_dir_all(&p)?;
- Ok(Self { path: Some(p) })
- }
-
- pub fn path(&self) -> &Path {
- self.path
- .as_ref()
- .expect("temp dir has already been removed")
- }
-
- pub fn remove(&mut self) {
- if let Some(p) = &self.path {
- let _ = fs::remove_dir_all(p);
- self.path = None;
- }
- }
-}
-
-impl Drop for TempDir {
- fn drop(&mut self) {
- self.remove();
- }
-}
-
-impl AsRef<Path> for TempDir {
- fn as_ref(&self) -> &Path {
- self.path()
- }
-}
+use crate::utils::{create_temp_dir, TempDir}; 
 
-impl Deref for TempDir {
- type Target = Path;
-
- fn deref(&self) -> &Self::Target {
- self.path()
- }
-}
 
 pub fn setup(testname: &str, cgroup_file: &str) -> (TempDir, PathBuf) {
  let tmp = create_temp_dir(testname).expect("create temp directory for test");
@@ -76,11 +32,6 @@ pub fn set_fixture(temp_dir: &Path, filename: &str, val: &str) -> Result<PathBuf
  Ok(full_path)
 }
 
-pub fn create_temp_dir(test_name: &str) -> Result<TempDir> {
- let dir = TempDir::new(std::env::temp_dir().join(test_name))?;
- Ok(dir)
-}
-
 pub struct LinuxCpuBuilder {
  resource: LinuxCpu,
 }

src/cgroups/v1/devices.rs

@@ -98,7 +98,8 @@ impl Devices {
 #[cfg(test)]
 mod tests {
  use super::*;
- use crate::cgroups::test::{create_temp_dir, set_fixture};
+ use crate::cgroups::test::set_fixture;
+ use crate::utils::create_temp_dir;
  use oci_spec::{LinuxDeviceCgroup, LinuxDeviceType};
  use std::fs::read_to_string;
 

src/cgroups/v1/freezer.rs

@@ -116,7 +116,8 @@ impl Freezer {
 #[cfg(test)]
 mod tests {
  use super::*;
- use crate::cgroups::test::{create_temp_dir, set_fixture};
+ use crate::cgroups::test::set_fixture;
+ use crate::utils::create_temp_dir; 
  use oci_spec::FreezerState;
 
  #[test]

src/cgroups/v1/hugetlb.rs

@@ -58,7 +58,8 @@ impl Hugetlb {
 #[cfg(test)]
 mod tests {
  use super::*;
- use crate::cgroups::test::{create_temp_dir, set_fixture};
+ use crate::cgroups::test::set_fixture;
+ use crate::utils::create_temp_dir; 
  use oci_spec::LinuxHugepageLimit;
  use std::fs::read_to_string;
 

src/cgroups/v1/memory.rs

@@ -239,7 +239,8 @@ impl Memory {
 #[cfg(test)]
 mod tests {
  use super::*;
- use crate::cgroups::test::{create_temp_dir, set_fixture};
+ use crate::cgroups::test::set_fixture;
+ use crate::utils::create_temp_dir; 
  use oci_spec::LinuxMemory;
 
  #[test]

src/cgroups/v1/network_classifier.rs

@@ -36,8 +36,8 @@ impl NetworkClassifier {
 
 #[cfg(test)]
 mod tests {
- use crate::cgroups::test::{create_temp_dir, set_fixture};
-
+ use crate::cgroups::test::set_fixture;
+ use crate::utils::create_temp_dir;
  use super::*;
 
  #[test]

src/cgroups/v1/network_priority.rs

@@ -36,7 +36,8 @@ impl NetworkPriority {
 #[cfg(test)]
 mod tests {
  use super::*;
- use crate::cgroups::test::{create_temp_dir, set_fixture};
+ use crate::cgroups::test::set_fixture;
+ use crate::utils::create_temp_dir;
  use oci_spec::LinuxInterfacePriority;
 
  #[test]

src/cgroups/v1/pids.rs

@@ -46,8 +46,8 @@ impl Pids {
 
 #[cfg(test)]
 mod tests {
- use crate::cgroups::test::{create_temp_dir, set_fixture};
-
+ use crate::cgroups::test::set_fixture;
+ use crate::utils::create_temp_dir;
  use super::*;
  use oci_spec::LinuxPids;
 

src/cgroups/v2/cpu.rs

@@ -86,7 +86,8 @@ impl Cpu {
 #[cfg(test)]
 mod tests {
  use super::*;
- use crate::cgroups::test::{create_temp_dir, set_fixture, setup, LinuxCpuBuilder};
+ use crate::cgroups::test::{set_fixture, setup, LinuxCpuBuilder};
+ use crate::utils::create_temp_dir;
  use std::fs;
 
  #[test]

src/tty.rs

@@ -68,3 +68,79 @@ pub fn setup_console(console_fd: FileDescriptor) -> Result<()> {
  close(console_fd.as_raw_fd())?;
  Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ use std::env;
+ use std::fs::{self, File};
+ use std::os::unix::net::UnixListener;
+ use std::path::PathBuf;
+
+ use serial_test::serial;
+
+ use crate::utils::{create_temp_dir, TempDir};
+
+
+ fn setup(testname: &str) -> Result<(TempDir, PathBuf, PathBuf)> {
+ let testdir = create_temp_dir(testname)?;
+ let rundir_path = Path::join(&testdir, "run");
+ let _ = fs::create_dir(&rundir_path)?;
+ let socket_path = Path::new(&rundir_path).join("socket");
+ let _ = File::create(&socket_path);
+ env::set_current_dir(&testdir)?;
+ Ok((testdir, rundir_path, socket_path))
+ }
+
+
+ #[test]
+ #[serial]
+ fn test_setup_console_socket() {
+ let init = setup("test_setup_console_socket");
+ assert!(init.is_ok());
+ let (testdir, rundir_path, socket_path) = init.unwrap();
+ let lis = UnixListener::bind(Path::join(&testdir, "console-socket"));
+ assert!(lis.is_ok());
+ let fd = setup_console_socket(&&rundir_path, &socket_path);
+ assert!(fd.is_ok());
+ assert_ne!(fd.unwrap().as_raw_fd(), -1);
+ }
+
+ #[test]
+ #[serial]
+ fn test_setup_console_socket_empty() {
+ let init = setup("test_setup_console_socket_empty");
+ assert!(init.is_ok());
+ let (_testdir, rundir_path, socket_path) = init.unwrap();
+ let fd = setup_console_socket(&rundir_path, &socket_path);
+ assert!(fd.is_ok());
+ assert_eq!(fd.unwrap().as_raw_fd(), -1);
+ }
+
+ #[test]
+ #[serial]
+ fn test_setup_console_socket_invalid() {
+ let init = setup("test_setup_console_socket_invalid");
+ assert!(init.is_ok());
+ let (testdir, rundir_path, socket_path) = init.unwrap();
+ let _socket = File::create(Path::join(&testdir, "console-socket"));
+ assert!(_socket.is_ok());
+ let fd = setup_console_socket(&rundir_path, &socket_path);
+ assert!(fd.is_err());
+ }
+
+ #[test]
+ #[serial]
+ fn test_setup_console() {
+ let init = setup("test_setup_console");
+ assert!(init.is_ok());
+ let (testdir, rundir_path, socket_path) = init.unwrap();
+ let lis = UnixListener::bind(Path::join(&testdir, "console-socket"));
+ assert!(lis.is_ok());
+ let fd = setup_console_socket(&&rundir_path, &socket_path);
+ let status = setup_console(fd.unwrap());
+ assert!(status.is_ok());
+ } 
+}
+