Skip to content

Commit de243f9

Browse files
smirashanduur
authored andcommitted
test: fix flakiness in RawVolumes test
We test for labels immediately after volume status is ready, but we should instead wait a bit for labels to be discovered. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit f85f82f)
1 parent ec8fde5 commit de243f9

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

internal/integration/api/volumes.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -707,17 +707,16 @@ func (suite *VolumesSuite) TestRawVolumes() {
707707
)
708708

709709
// verify that volume labels are set properly
710-
expectedLabels := xslices.ToSet(rawVolumeIDs)
711-
712-
dvs, err := safe.StateListAll[*block.DiscoveredVolume](ctx, suite.Client.COSI)
713-
suite.Require().NoError(err)
710+
for _, rawVolumeID := range rawVolumeIDs {
711+
vs, err := safe.StateGetByID[*block.VolumeStatus](ctx, suite.Client.COSI, rawVolumeID)
712+
suite.Require().NoError(err)
714713

715-
for dv := range dvs.All() {
716-
delete(expectedLabels, dv.TypedSpec().PartitionLabel)
714+
rtestutils.AssertResource(ctx, suite.T(), suite.Client.COSI, filepath.Base(vs.TypedSpec().Location),
715+
func(dv *block.DiscoveredVolume, asrt *assert.Assertions) {
716+
asrt.Equal(vs.Metadata().ID(), dv.TypedSpec().PartitionLabel, "expected discovered volume %s to have label %s", dv.Metadata().ID(), vs.Metadata().ID())
717+
})
717718
}
718719

719-
suite.Require().Empty(expectedLabels, "expected labels %v to be set on discovered volumes", expectedLabels)
720-
721720
// now, remove one of the volumes, wipe the partition and re-create the volume
722721
vs, err := safe.ReaderGetByID[*block.VolumeStatus](ctx, suite.Client.COSI, rawVolumeIDs[0])
723722
suite.Require().NoError(err)

0 commit comments

Comments
 (0)