github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-27 15:57:09 +00:00
Code Issues Projects Releases Wiki Activity

dragonball: Improve test cases

Browse Source 
The same EpollManager should be used instead of creating two.

Signed-off-by: wllenyj <wllenyj@linux.alibaba.com>
This commit is contained in:
wllenyj 2022-11-09 11:19:19 +08:00
parent dc90c6e30b
commit 510798155d
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dragonball/src/api/v1/vmm_action.rs
View File

@ -656,10 +656,10 @@ mod tests {
let (to_vmm, from_api) = channel(); let (to_vmm, from_api) = channel();
let (to_api, from_vmm) = channel(); let (to_api, from_vmm) = channel();
let vmm = Arc::new(Mutex::new(create_vmm_instance())); let epoll_mgr = EpollManager::default();
let vmm = Arc::new(Mutex::new(create_vmm_instance(epoll_mgr.clone())));
let mut vservice = VmmService::new(from_api, to_api); let mut vservice = VmmService::new(from_api, to_api);
let epoll_mgr = EpollManager::default();
let mut event_mgr = EventManager::new(&vmm, epoll_mgr).unwrap(); let mut event_mgr = EventManager::new(&vmm, epoll_mgr).unwrap();
let mut v = vmm.lock().unwrap(); let mut v = vmm.lock().unwrap();
@ -681,9 +681,9 @@ mod tests {
let (_to_vmm, from_api) = channel(); let (_to_vmm, from_api) = channel();
let (to_api, _from_vmm) = channel(); let (to_api, _from_vmm) = channel();
let vmm = Arc::new(Mutex::new(create_vmm_instance()));
let mut vservice = VmmService::new(from_api, to_api);
let epoll_mgr = EpollManager::default(); let epoll_mgr = EpollManager::default();
let vmm = Arc::new(Mutex::new(create_vmm_instance(epoll_mgr.clone())));
let mut vservice = VmmService::new(from_api, to_api);
let mut event_mgr = EventManager::new(&vmm, epoll_mgr).unwrap(); let mut event_mgr = EventManager::new(&vmm, epoll_mgr).unwrap();
let mut v = vmm.lock().unwrap(); let mut v = vmm.lock().unwrap();
@ -695,9 +695,9 @@ mod tests {
fn test_vmm_action_disconnected() { fn test_vmm_action_disconnected() {
let (to_vmm, from_api) = channel(); let (to_vmm, from_api) = channel();
let (to_api, _from_vmm) = channel(); let (to_api, _from_vmm) = channel();
let vmm = Arc::new(Mutex::new(create_vmm_instance()));
let mut vservice = VmmService::new(from_api, to_api);
let epoll_mgr = EpollManager::default(); let epoll_mgr = EpollManager::default();
let vmm = Arc::new(Mutex::new(create_vmm_instance(epoll_mgr.clone())));
let mut vservice = VmmService::new(from_api, to_api);
let mut event_mgr = EventManager::new(&vmm, epoll_mgr).unwrap(); let mut event_mgr = EventManager::new(&vmm, epoll_mgr).unwrap();
let mut v = vmm.lock().unwrap(); let mut v = vmm.lock().unwrap();

4
src/dragonball/src/device_manager/mod.rs
View File

@ -1065,7 +1065,9 @@ mod tests {
use crate::vm::VmConfigInfo; use crate::vm::VmConfigInfo;
let epoll_manager = EpollManager::default(); let epoll_manager = EpollManager::default();
let vmm = Arc::new(Mutex::new(crate::vmm::tests::create_vmm_instance())); let vmm = Arc::new(Mutex::new(crate::vmm::tests::create_vmm_instance(
epoll_manager.clone(),
)));
let event_mgr = crate::event_manager::EventManager::new(&vmm, epoll_manager).unwrap(); let event_mgr = crate::event_manager::EventManager::new(&vmm, epoll_manager).unwrap();
let mut vm = crate::vm::tests::create_vm_instance(); let mut vm = crate::vm::tests::create_vm_instance();
let vm_config = VmConfigInfo { let vm_config = VmConfigInfo {

4
src/dragonball/src/vm/mod.rs
View File

@ -921,8 +921,10 @@ pub mod tests {
#[test] #[test]
fn test_vm_create_devices() { fn test_vm_create_devices() {
skip_if_not_root!(); skip_if_not_root!();
let vmm = Arc::new(Mutex::new(crate::vmm::tests::create_vmm_instance()));
let epoll_mgr = EpollManager::default(); let epoll_mgr = EpollManager::default();
let vmm = Arc::new(Mutex::new(crate::vmm::tests::create_vmm_instance(
epoll_mgr.clone(),
)));
let mut guard = vmm.lock().unwrap(); let mut guard = vmm.lock().unwrap();
let vm = guard.get_vm_mut().unwrap(); let vm = guard.get_vm_mut().unwrap();

5
src/dragonball/src/vmm.rs
View File

@ -200,11 +200,10 @@ pub(crate) mod tests {
use super::*; use super::*;
pub fn create_vmm_instance() -> Vmm { pub fn create_vmm_instance(epoll_manager: EpollManager) -> Vmm {
let info = Arc::new(RwLock::new(InstanceInfo::default())); let info = Arc::new(RwLock::new(InstanceInfo::default()));
let event_fd = EventFd::new(libc::EFD_NONBLOCK).unwrap(); let event_fd = EventFd::new(libc::EFD_NONBLOCK).unwrap();
let seccomp_filter: BpfProgram = Vec::new(); let seccomp_filter: BpfProgram = Vec::new();
let epoll_manager = EpollManager::default();
Vmm::new_with_epoll_manager( Vmm::new_with_epoll_manager(
info, info,
@ -221,6 +220,6 @@ pub(crate) mod tests {
fn test_create_vmm_instance() { fn test_create_vmm_instance() {
skip_if_not_root!(); skip_if_not_root!();
create_vmm_instance(); create_vmm_instance(EpollManager::default());
} }
} }