External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-03 11:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "tests: Extend test_*_reboot with checks on fd leaking"

Browse Source 
This reverts commit 7dc4e91303.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-06-05 12:53:22 +01:00
parent 7dc4e91303
commit eabf43fbf6
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration.rs
View File

@ -2891,10 +2891,6 @@ mod tests {
});
}
fn get_fd_count(pid: u32) -> usize {
fs::read_dir(format!("/proc/{}/fd", pid)).unwrap().count()
}
#[cfg_attr(not(feature = "mmio"), test)]
fn test_reboot() {
test_block!(tb, "", {
@ -2922,7 +2918,7 @@ mod tests {
.unwrap();
thread::sleep(std::time::Duration::new(20, 0));
let fd_count_1 = get_fd_count(child.id());
let reboot_count = guest
.ssh_command("sudo journalctl | grep -c -- \"-- Reboot --\"")
.unwrap_or_default()
@ -2934,7 +2930,6 @@ mod tests {
guest.ssh_command("sudo reboot").unwrap_or_default();
thread::sleep(std::time::Duration::new(20, 0));
let fd_count_2 = get_fd_count(child.id());
let reboot_count = guest
.ssh_command("sudo journalctl | grep -c -- \"-- Reboot --\"")
.unwrap_or_default()
@ -2942,7 +2937,6 @@ mod tests {
.parse::<u32>()
.unwrap_or_default();
aver_eq!(tb, reboot_count, 1);
aver_eq!(tb, fd_count_1, fd_count_2);
guest
.ssh_command("sudo shutdown -h now")
@ -2980,7 +2974,7 @@ mod tests {
.unwrap();
thread::sleep(std::time::Duration::new(20, 0));
let fd_count_1 = get_fd_count(child.id());
let reboot_count = guest
.ssh_command("journalctl | grep -c -- \"-- Reboot --\"")
.unwrap_or_default()
@ -2992,7 +2986,6 @@ mod tests {
guest.ssh_command("sudo reboot")?;
thread::sleep(std::time::Duration::new(20, 0));
let fd_count_2 = get_fd_count(child.id());
let reboot_count = guest
.ssh_command("sudo journalctl | grep -c -- \"-- Reboot --\"")
.unwrap_or_default()
@ -3000,7 +2993,6 @@ mod tests {
.parse::<u32>()
.unwrap_or_default();
aver_eq!(tb, reboot_count, 1);
aver_eq!(tb, fd_count_1, fd_count_2);
guest.ssh_command("sudo shutdown -h now")?;
thread::sleep(std::time::Duration::new(20, 0));