@@ -648,14 +648,19 @@ func (suite *VolumesSuite) TestUserVolumesPartition() {
648648 rtestutils .AssertNoResource [* block.VolumeStatus ](ctx , suite .T (), suite .Client .COSI , userVolumeID )
649649 }
650650
651- suite .Require ().NoError (suite .Client .BlockDeviceWipe (ctx , & storage.BlockDeviceWipeRequest {
652- Devices : []* storage.BlockDeviceWipeDescriptor {
653- {
654- Device : filepath .Base (userDisks [0 ]),
655- Method : storage .BlockDeviceWipeDescriptor_FAST ,
651+ suite .Require ().EventuallyWithT (func (collect * assert.CollectT ) {
652+ // a little retry loop, as the device might be considered busy for a little while after unmounting
653+ asrt := assert .New (collect )
654+
655+ asrt .NoError (suite .Client .BlockDeviceWipe (ctx , & storage.BlockDeviceWipeRequest {
656+ Devices : []* storage.BlockDeviceWipeDescriptor {
657+ {
658+ Device : filepath .Base (userDisks [0 ]),
659+ Method : storage .BlockDeviceWipeDescriptor_FAST ,
660+ },
656661 },
657- },
658- }) )
662+ }))
663+ }, time . Minute , time . Second , "failed to wipe disk %s" , userDisks [ 0 ] )
659664
660665 // wait for the discovered volume reflect wiped status
661666 rtestutils .AssertResource (ctx , suite .T (), suite .Client .COSI , filepath .Base (userDisks [0 ]),
@@ -819,14 +824,19 @@ func (suite *VolumesSuite) TestUserVolumesDisk() {
819824 rtestutils .AssertNoResource [* block.VolumeStatus ](ctx , suite .T (), suite .Client .COSI , userVolumeID )
820825 }
821826
822- suite .Require ().NoError (suite .Client .BlockDeviceWipe (ctx , & storage.BlockDeviceWipeRequest {
823- Devices : []* storage.BlockDeviceWipeDescriptor {
824- {
825- Device : filepath .Base (userDisks [0 ]),
826- Method : storage .BlockDeviceWipeDescriptor_FAST ,
827+ suite .Require ().EventuallyWithT (func (collect * assert.CollectT ) {
828+ // a little retry loop, as the device might be considered busy for a little while after unmounting
829+ asrt := assert .New (collect )
830+
831+ asrt .NoError (suite .Client .BlockDeviceWipe (ctx , & storage.BlockDeviceWipeRequest {
832+ Devices : []* storage.BlockDeviceWipeDescriptor {
833+ {
834+ Device : filepath .Base (userDisks [0 ]),
835+ Method : storage .BlockDeviceWipeDescriptor_FAST ,
836+ },
827837 },
828- },
829- }) )
838+ }))
839+ }, time . Minute , time . Second , "failed to wipe disk %s" , userDisks [ 0 ] )
830840
831841 // wait for the discovered volume reflect wiped status
832842 rtestutils .AssertResource (ctx , suite .T (), suite .Client .COSI , filepath .Base (userDisks [0 ]),
@@ -1058,14 +1068,19 @@ func (suite *VolumesSuite) TestRawVolumes() {
10581068 rtestutils .AssertNoResource [* block.VolumeStatus ](ctx , suite .T (), suite .Client .COSI , rawVolumeID )
10591069 }
10601070
1061- suite .Require ().NoError (suite .Client .BlockDeviceWipe (ctx , & storage.BlockDeviceWipeRequest {
1062- Devices : []* storage.BlockDeviceWipeDescriptor {
1063- {
1064- Device : filepath .Base (userDisks [0 ]),
1065- Method : storage .BlockDeviceWipeDescriptor_FAST ,
1071+ suite .Require ().EventuallyWithT (func (collect * assert.CollectT ) {
1072+ // a little retry loop, as the device might be considered busy for a little while after unmounting
1073+ asrt := assert .New (collect )
1074+
1075+ asrt .NoError (suite .Client .BlockDeviceWipe (ctx , & storage.BlockDeviceWipeRequest {
1076+ Devices : []* storage.BlockDeviceWipeDescriptor {
1077+ {
1078+ Device : filepath .Base (userDisks [0 ]),
1079+ Method : storage .BlockDeviceWipeDescriptor_FAST ,
1080+ },
10661081 },
1067- },
1068- }) )
1082+ }))
1083+ }, time . Minute , time . Second , "failed to wipe disk %s" , userDisks [ 0 ] )
10691084
10701085 // wait for the discovered volume reflect wiped status
10711086 rtestutils .AssertResource (ctx , suite .T (), suite .Client .COSI , filepath .Base (userDisks [0 ]),
@@ -1207,14 +1222,19 @@ func (suite *VolumesSuite) TestExistingVolumes() {
12071222
12081223 rtestutils .AssertNoResource [* block.VolumeStatus ](ctx , suite .T (), suite .Client .COSI , existingVolumeID )
12091224
1210- suite .Require ().NoError (suite .Client .BlockDeviceWipe (ctx , & storage.BlockDeviceWipeRequest {
1211- Devices : []* storage.BlockDeviceWipeDescriptor {
1212- {
1213- Device : filepath .Base (userDisks [0 ]),
1214- Method : storage .BlockDeviceWipeDescriptor_FAST ,
1225+ suite .Require ().EventuallyWithT (func (collect * assert.CollectT ) {
1226+ // a little retry loop, as the device might be considered busy for a little while after unmounting
1227+ asrt := assert .New (collect )
1228+
1229+ asrt .NoError (suite .Client .BlockDeviceWipe (ctx , & storage.BlockDeviceWipeRequest {
1230+ Devices : []* storage.BlockDeviceWipeDescriptor {
1231+ {
1232+ Device : filepath .Base (userDisks [0 ]),
1233+ Method : storage .BlockDeviceWipeDescriptor_FAST ,
1234+ },
12151235 },
1216- },
1217- }) )
1236+ }))
1237+ }, time . Minute , time . Second , "failed to wipe disk %s" , userDisks [ 0 ] )
12181238
12191239 // wait for the discovered volume reflect wiped status
12201240 rtestutils .AssertResource (ctx , suite .T (), suite .Client .COSI , filepath .Base (userDisks [0 ]),
@@ -1442,14 +1462,19 @@ func (suite *VolumesSuite) TestSwapOnOff() {
14421462 rtestutils .AssertNoResource [* block.SwapStatus ](ctx , suite .T (), suite .Client .COSI , volumeStatus .TypedSpec ().MountLocation )
14431463 rtestutils .AssertNoResource [* block.VolumeConfig ](ctx , suite .T (), suite .Client .COSI , swapVolumeID )
14441464
1445- suite .Require ().NoError (suite .Client .BlockDeviceWipe (ctx , & storage.BlockDeviceWipeRequest {
1446- Devices : []* storage.BlockDeviceWipeDescriptor {
1447- {
1448- Device : filepath .Base (userDisks [0 ]),
1449- Method : storage .BlockDeviceWipeDescriptor_FAST ,
1465+ suite .Require ().EventuallyWithT (func (collect * assert.CollectT ) {
1466+ // a little retry loop, as the device might be considered busy for a little while after unmounting
1467+ asrt := assert .New (collect )
1468+
1469+ asrt .NoError (suite .Client .BlockDeviceWipe (ctx , & storage.BlockDeviceWipeRequest {
1470+ Devices : []* storage.BlockDeviceWipeDescriptor {
1471+ {
1472+ Device : filepath .Base (userDisks [0 ]),
1473+ Method : storage .BlockDeviceWipeDescriptor_FAST ,
1474+ },
14501475 },
1451- },
1452- }) )
1476+ }))
1477+ }, time . Minute , time . Second , "failed to wipe disk %s" , userDisks [ 0 ] )
14531478}
14541479
14551480// TestZswapStatus verifies that all zswap-enabled machines have zswap running.
0 commit comments