* [e2e] fix bug in fixture vm_checker

harvester_e2e_tests/fixtures/virtualmachines.py

@@ -93,8 +93,14 @@ def vm_login_from_host(
 
 
 @pytest.fixture(scope="session")
-def vm_checker(api_client, wait_timeout):
+def vm_checker(request, api_client, wait_timeout):
     def _cb(code, data):
+        ''' identity callback function for adjust checking condition.
+
+        :rtype: boolean
+        :return: True when hit the additional check
+        '''
+
         return True
 
     class VMChecker:
@@ -114,7 +120,7 @@ def wait_stopped(self, vm_name, endtime=None, callback=_cb, **kws):
             endtime = endtime or self._endtime()
             while endtime > datetime.now():
                 code, data = self.vms.get_status(vm_name)
-                if 404 == code and _cb(code, data):
+                if 404 == code and callback(code, data):
                     break
                 sleep(self.snooze)
             else:
@@ -140,7 +146,7 @@ def wait_started(self, vm_name, endtime=None, callback=_cb, **kws):
                 if (
                     200 == code
                     and "Running" == data.get('status', {}).get('phase')
-                    and _cb(code, data)
+                    and callback(code, data)
                 ):
                     break
                 sleep(self.snooze)
@@ -149,28 +155,28 @@ def wait_started(self, vm_name, endtime=None, callback=_cb, **kws):
             return True, (code, data)
 
         def wait_agent_connected(self, vm_name, endtime=None, callback=_cb, **kws):
-            def cb_(code, data):
+            def cb(code, data):
                 conds = data.get('status', {}).get('conditions', [{}])
                 return (
                     "AgentConnected" == conds[-1].get('type')
-                    and _cb(code, data)
+                    and callback(code, data)
                 )
 
-            return self.wait_started(vm_name, endtime, cb_, **kws)
+            return self.wait_started(vm_name, endtime, cb, **kws)
 
         def wait_interfaces(self, vm_name, endtime=None, callback=_cb, **kws):
-            def cb_(code, data):
+            def cb(code, data):
                 return (
                     data.get('status', {}).get('interfaces')
-                    and _cb(code, data)
+                    and callback(code, data)
                 )
-            return self.wait_agent_connected(vm_name, endtime, callback, **kws)
+            return self.wait_agent_connected(vm_name, endtime, cb, **kws)
 
         def wait_cloudinit_done(self, shell, endtime=None, callback=_cb, **kws):
             endtime = endtime or self._endtime()
             while endtime > datetime.now():
                 out, err = shell.exec_command('cloud-init status')
-                if 'done' in out and _cb(out, err):
+                if 'done' in out and callback(out, err):
                     break
                 sleep(self.snooze)
             else:
@@ -186,11 +192,15 @@ def wait_migrated(self, vm_name, new_host, endtime=None, callback=_cb, **kws):
             while endtime > datetime.now():
                 code, data = self.vms.get_status(vm_name)
                 migrating = data['metadata']['annotations'].get("harvesterhci.io/migrationState")
-                if not migrating and new_host == data['status']['nodeName'] and _cb(code, data):
+                if (
+                    not migrating and new_host == data['status']['nodeName']
+                    and callback(code, data)
+                ):
                     break
                 sleep(self.snooze)
             else:
                 return False, (code, data)
             return True, (code, data)
 
-    return VMChecker(api_client.vms, wait_timeout)
+    return VMChecker(api_client.vms, wait_timeout,
+                     request.config.getoption("--sleep-timeout") or 3)

harvester_e2e_tests/integration/test_backup_restore.py

@@ -365,7 +365,7 @@ def test_restore_with_new_vm(
             sh.exec_command('sync')
 
         # Restore VM into new
-        restored_vm_name = f"{backup_config[0]}.lower()-restore-{unique_vm_name}"
+        restored_vm_name = f"{backup_config[0].lower()}-restore-{unique_vm_name}"
         spec = api_client.backups.RestoreSpec.for_new(restored_vm_name)
         code, data = api_client.backups.restore(unique_vm_name, spec)
         assert 201 == code, (code, data)