diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index 48eb52464..1d9daeeb2 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -89,7 +89,7 @@ if [ ! -f "$VIRTIOFSD" ]; then cp virtiofsd $VIRTIOFSD popd rm -rf $QEMU_DIR - sudo setcap cap_sys_admin+epi "virtiofsd" + sudo setcap cap_dac_override,cap_sys_admin+epi "virtiofsd" popd fi diff --git a/src/main.rs b/src/main.rs index 3ca55149c..6d6b3ef76 100755 --- a/src/main.rs +++ b/src/main.rs @@ -545,6 +545,8 @@ mod tests { .spawn() .unwrap(); + thread::sleep(std::time::Duration::new(10, 0)); + (child, virtiofsd_socket_path) } @@ -1246,6 +1248,9 @@ mod tests { ); guest.ssh_command("sudo reboot")?; + thread::sleep(std::time::Duration::new(10, 0)); + let _ = child.kill(); + let _ = daemon_child.kill(); let _ = child.wait(); let _ = daemon_child.wait(); Ok(()) @@ -1323,6 +1328,8 @@ mod tests { ); guest.ssh_command("sudo reboot")?; + thread::sleep(std::time::Duration::new(10, 0)); + let _ = child.kill(); let _ = child.wait(); Ok(()) @@ -1366,6 +1373,8 @@ mod tests { aver!(tb, guest.get_total_memory().unwrap_or_default() > 496_000); guest.ssh_command("sudo reboot")?; + thread::sleep(std::time::Duration::new(10, 0)); + let _ = child.kill(); let _ = child.wait(); Ok(())