Skip to content

Commit eec183b

Browse files
committed
fix: add waiter additionnal volume
1 parent 561458d commit eec183b

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

scaleway/tests/test_instance.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ def tearDown(self) -> None:
4444
self.blockAPI.delete_volume(volume_id=volume.id)
4545
logger.info("✅ Volume {volume.id} has been deleted")
4646
if self._server:
47-
self.api.delete_server(zone=self.zone, server_id=self._server.id)
47+
self.instanceAPI.delete_server(zone=self.zone, server_id=self._server.id)
4848
logger.info(f"🗑️ Deleted server: {self._server.id}")
4949

5050
def wait_test_instance_server(self, server_id):
5151
interval = interval
5252
for i in range(1, max_retry):
5353
interval *= i
54-
s = self.api.get_server(zone=self.zone, server_id=server_id)
54+
s = self.instanceAPI.get_server(zone=self.zone, server_id=server_id)
5555
if s.state == "running":
5656
logger.info(f"✅ Server {server_id} is running.")
5757
break
@@ -84,6 +84,7 @@ def create_test_from_empty_volume(self, number) -> List[Volume]:
8484
from_empty=CreateVolumeRequestFromEmpty(size=10),
8585
)
8686
logger.info("✅ Created server: {volume.id}")
87+
self.blockAPI.wait_for_volume(volume_id=volume.id, zone=self.zone)
8788
self._volumes.append(volume) # Ensure cleanup in tearDown
8889
volumes.append(volume)
8990

@@ -92,7 +93,7 @@ def create_test_from_empty_volume(self, number) -> List[Volume]:
9293
def test_attach_aditionnal_volume(self):
9394
server = self.create_test_instance_server()
9495
additional_volumes = self.create_test_from_empty_volume(1)
95-
additional_volume = list(additional_volumes.values())[0]
96+
additional_volume = additional_volumes.values()[0]
9697

9798
self.assertIsNotNone(server.id)
9899
self.assertEqual(server.zone, self.zone)
@@ -104,9 +105,10 @@ def test_attach_aditionnal_volume(self):
104105
self.instanceAPI.attach_server_volume(
105106
server_id=server.id, volume_id=additional_volume.id
106107
)
107-
logger.info(f"🔗 Attached volume {additional_volume.id} to server {server.id}")
108108

109-
time.sleep(timeout_attach)
109+
self.blockAPI.wait_for_volume(volume_id=additional_volume.id, zone=self.zone)
110+
111+
logger.info(f"🔗 Attached volume {additional_volume.id} to server {server.id}")
110112

111113
updated_server = self.instanceAPI.get_server(
112114
zone=self.zone, server_id=server.id

0 commit comments

Comments
 (0)