diff options
author | Alan Somers <asomers@gmail.com> | 2017-07-16 16:24:30 -0600 |
---|---|---|
committer | Alan Somers <asomers@gmail.com> | 2017-07-17 18:27:44 -0600 |
commit | ce7c961c04003ab51b7c027bb29d465fd66caef1 (patch) | |
tree | 024011bfaf7a486141aea6e6c4b79278eae73ab2 | |
parent | bb4105afceba87b75d17481ef68a2ae9e79ee7be (diff) | |
download | nix-ce7c961c04003ab51b7c027bb29d465fd66caef1.zip |
Fix some bugs in the termios tests
* Make test_tcgetattr deterministic. The old version behaved
differently depending on what file descriptors were opened by the
harness or by other tests, and could race against other tests.
* Close some file descriptor leaks
Fixes #154
-rw-r--r-- | test/sys/test_termios.rs | 46 |
1 files changed, 30 insertions, 16 deletions
diff --git a/test/sys/test_termios.rs b/test/sys/test_termios.rs index 308cf62c..c6572052 100644 --- a/test/sys/test_termios.rs +++ b/test/sys/test_termios.rs @@ -1,6 +1,7 @@ use std::os::unix::prelude::*; +use tempfile::tempfile; -use nix::{Error, fcntl, unistd}; +use nix::{Error, fcntl}; use nix::errno::Errno; use nix::pty::openpty; use nix::sys::termios::{self, ECHO, OPOST, OCRNL, Termios, tcgetattr}; @@ -14,22 +15,27 @@ fn write_all(f: RawFd, buf: &[u8]) { } } +// Test tcgetattr on a terminal #[test] -fn test_tcgetattr() { - for fd in 0..5 { - let termios = termios::tcgetattr(fd); - match unistd::isatty(fd) { - // If `fd` is a TTY, tcgetattr must succeed. - Ok(true) => assert!(termios.is_ok()), - // If it's an invalid file descriptor, tcgetattr should also return - // the same error - Err(Error::Sys(Errno::EBADF)) => { - assert_eq!(termios.err(), Some(Error::Sys(Errno::EBADF))); - }, - // Otherwise it should return any error - _ => assert!(termios.is_err()) - } - } +fn test_tcgetattr_pty() { + let pty = openpty(None, None).unwrap(); + assert!(termios::tcgetattr(pty.master).is_ok()); + close(pty.master).unwrap(); + close(pty.slave).unwrap(); +} +// Test tcgetattr on something that isn't a terminal +#[test] +fn test_tcgetattr_enotty() { + let file = tempfile().unwrap(); + assert_eq!(termios::tcgetattr(file.as_raw_fd()).err(), + Some(Error::Sys(Errno::ENOTTY))); +} + +// Test tcgetattr on an invalid file descriptor +#[test] +fn test_tcgetattr_ebadf() { + assert_eq!(termios::tcgetattr(-1).err(), + Some(Error::Sys(Errno::EBADF))); } // Test modifying output flags @@ -41,6 +47,8 @@ fn test_output_flags() { assert!(pty.master > 0); assert!(pty.slave > 0); let termios = tcgetattr(pty.master).unwrap(); + close(pty.master).unwrap(); + close(pty.slave).unwrap(); termios }; @@ -64,6 +72,8 @@ fn test_output_flags() { let mut buf = [0u8; 10]; ::read_exact(pty.slave, &mut buf); let transformed_string = "foofoofoo\n"; + close(pty.master).unwrap(); + close(pty.slave).unwrap(); assert_eq!(&buf, transformed_string.as_bytes()); } @@ -76,6 +86,8 @@ fn test_local_flags() { assert!(pty.master > 0); assert!(pty.slave > 0); let termios = tcgetattr(pty.master).unwrap(); + close(pty.master).unwrap(); + close(pty.slave).unwrap(); termios }; @@ -102,6 +114,8 @@ fn test_local_flags() { // Try to read from the master, which should not have anything as echoing was disabled. let mut buf = [0u8; 10]; let read = read(pty.master, &mut buf).unwrap_err(); + close(pty.master).unwrap(); + close(pty.slave).unwrap(); assert_eq!(read, Error::Sys(Errno::EAGAIN)); } |