dragonball: Improve test cases

The same EpollManager should be used instead of creating two.

Signed-off-by: wllenyj <wllenyj@linux.alibaba.com>

src/dragonball/src/api/v1/vmm_action.rs

@@ -656,10 +656,10 @@ mod tests {
             let (to_vmm, from_api) = 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 epoll_mgr = EpollManager::default();
             let mut event_mgr = EventManager::new(&vmm, epoll_mgr).unwrap();
             let mut v = vmm.lock().unwrap();
 
@@ -681,9 +681,9 @@ mod tests {
 
         let (_to_vmm, from_api) = 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 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 v = vmm.lock().unwrap();
 
@@ -695,9 +695,9 @@ mod tests {
     fn test_vmm_action_disconnected() {
         let (to_vmm, from_api) = 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 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 v = vmm.lock().unwrap();
 

src/dragonball/src/device_manager/mod.rs

@@ -1065,7 +1065,9 @@ mod tests {
         use crate::vm::VmConfigInfo;
 
         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 mut vm = crate::vm::tests::create_vm_instance();
         let vm_config = VmConfigInfo {

src/dragonball/src/vm/mod.rs

@@ -921,8 +921,10 @@ pub mod tests {
     #[test]
     fn test_vm_create_devices() {
         skip_if_not_root!();
-        let vmm = Arc::new(Mutex::new(crate::vmm::tests::create_vmm_instance()));
         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 vm = guard.get_vm_mut().unwrap();

src/dragonball/src/vmm.rs

@@ -200,11 +200,10 @@ pub(crate) mod tests {
 
     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 event_fd = EventFd::new(libc::EFD_NONBLOCK).unwrap();
         let seccomp_filter: BpfProgram = Vec::new();
-        let epoll_manager = EpollManager::default();
 
         Vmm::new_with_epoll_manager(
             info,
@@ -221,6 +220,6 @@ pub(crate) mod tests {
     fn test_create_vmm_instance() {
         skip_if_not_root!();
 
-        create_vmm_instance();
+        create_vmm_instance(EpollManager::default());
     }
 }