shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00
Code Issues Releases Wiki Activity

Fixed codes and tests... Need to upgrade OpenStack publication and test

Browse Source
This commit is contained in:
Adolfo Gómez García 2024-06-16 20:55:09 +02:00
parent 50f02d1169
commit 1a33f3d6d5
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
3 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/tests/services/openstack/fixtures.py
View File

@ -312,6 +312,32 @@ CLIENT_METHODS_INFO: typing.Final[list[AutoSpecMethodInfo]] = [
openstack_client.OpenstackClient.is_available,
returns=True,
),
AutoSpecMethodInfo(
openstack_client.OpenstackClient.start_server,
returns=set_vm_state,
partial_kwargs={'state': openstack_types.PowerState.RUNNING},
),
AutoSpecMethodInfo(
openstack_client.OpenstackClient.stop_server,
returns=set_vm_state,
partial_kwargs={'state': openstack_types.PowerState.SHUTDOWN},
),
AutoSpecMethodInfo(
openstack_client.OpenstackClient.reboot_server,
returns=set_vm_state,
partial_kwargs={'state': openstack_types.PowerState.RUNNING},
),
AutoSpecMethodInfo(
openstack_client.OpenstackClient.suspend_server,
returns=set_vm_state,
partial_kwargs={'state': openstack_types.PowerState.SUSPENDED},
),
AutoSpecMethodInfo(
openstack_client.OpenstackClient.resume_server,
returns=set_vm_state,
partial_kwargs={'state': openstack_types.PowerState.RUNNING},
),
# connect returns None
# Test method
# AutoSpecMethodInfo(client.Client.list_projects, returns=True),

13
server/src/tests/services/openstack/test_userservice.py
View File

@ -120,12 +120,13 @@ class TestOpenstackLiveDeployment(UDSTransactionTestCase):
for _ in limited_iterator(lambda: state == types.states.TaskState.RUNNING, limit=128):
state = userservice.check_state()
# If first item in queue is WAIT, we must "simulate" the wake up from os manager
if userservice._queue[0] == types.services.Operation.WAIT:
userservice.process_ready_from_os_manager(None)
self.assertEqual(state, types.states.TaskState.FINISHED)
self.assertEqual(state, types.states.TaskState.FINISHED, f'Queue: {userservice._queue} {userservice._error_debug_info}')
self.assertEqual(userservice._name[: len(service.get_basename())], service.get_basename())
self.assertEqual(len(userservice._name), len(service.get_basename()) + service.get_lenname())
@ -133,7 +134,7 @@ class TestOpenstackLiveDeployment(UDSTransactionTestCase):
vmid = userservice._vmid
self.assert_basic_calls(userservice, api)
# And stop the machine
api.shutdown_vm.assert_called_with(vmid)
api().stop_server.assert_called_with(vmid)
def test_userservice_linked_user(self) -> None:
"""
@ -187,10 +188,8 @@ class TestOpenstackLiveDeployment(UDSTransactionTestCase):
# Ensure DESTROY_VALIDATOR is in the queue
self.assertIn(types.services.Operation.DESTROY_VALIDATOR, userservice._queue)
for counter in limited_iterator(lambda: state == types.states.TaskState.RUNNING, limit=128):
for _ in limited_iterator(lambda: state == types.states.TaskState.RUNNING, limit=128):
state = userservice.check_state()
if counter == 8: # Stop so it can continue
fixtures.set_vm_state(userservice._vmid, fixtures.openstack_types.PowerState.SHUTDOWN)
# Now, should be finished without any problem, no call to api should have been done
self.assertEqual(state, types.states.TaskState.FINISHED, f'State: {state} {userservice._error_debug_info}')
@ -222,10 +221,8 @@ class TestOpenstackLiveDeployment(UDSTransactionTestCase):
self.assertIn(types.services.Operation.DELETE, userservice._queue)
self.assertIn(types.services.Operation.DELETE_COMPLETED, userservice._queue)
for counter in limited_iterator(lambda: state == types.states.TaskState.RUNNING, limit=128):
for _ in limited_iterator(lambda: state == types.states.TaskState.RUNNING, limit=128):
state = userservice.check_state()
if counter == 8:
fixtures.set_vm_state(userservice._vmid, fixtures.openstack_types.PowerState.SHUTDOWN)
self.assertEqual(state, types.states.TaskState.FINISHED, f'State: {state} {userservice._error_debug_info}')

2
server/src/tests/services/openstack/test_userservice_fixed.py
View File

@ -98,7 +98,7 @@ class TestOpenstackFixedUserService(UDSTransactionTestCase):
# ensure cache is empty, may affect from other tests
userservice.cache.clear()
# Also that machine is stopped
fixtures.get_id(fixtures.SERVERS_LIST, userservice._vmid).power_state = (
fixtures.search_id(fixtures.SERVERS_LIST, userservice._vmid).power_state = (
openstack_types.PowerState.SHUTDOWN
)
state = userservice.set_ready()