Skip to content

Commit efe5438

Browse files
committed
models/krate: Use stable sort order in owners() fns
This makes it easier to write non-flaky tests :)
1 parent affcc3e commit efe5438

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/models/krate.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ impl Crate {
360360

361361
let users = CrateOwner::by_owner_kind(OwnerKind::User)
362362
.filter(crate_owners::crate_id.eq(self.id))
363+
.order((crate_owners::owner_id, crate_owners::owner_kind))
363364
.inner_join(users::table)
364365
.select(User::as_select())
365366
.load(conn)
@@ -369,6 +370,7 @@ impl Crate {
369370

370371
let teams = CrateOwner::by_owner_kind(OwnerKind::Team)
371372
.filter(crate_owners::crate_id.eq(self.id))
373+
.order((crate_owners::owner_id, crate_owners::owner_kind))
372374
.inner_join(teams::table)
373375
.select(Team::as_select())
374376
.load(conn)
@@ -384,13 +386,15 @@ impl Crate {
384386

385387
let users = CrateOwner::by_owner_kind(OwnerKind::User)
386388
.filter(crate_owners::crate_id.eq(self.id))
389+
.order((crate_owners::owner_id, crate_owners::owner_kind))
387390
.inner_join(users::table)
388391
.select(User::as_select())
389392
.load(conn)?
390393
.into_iter()
391394
.map(Owner::User);
392395
let teams = CrateOwner::by_owner_kind(OwnerKind::Team)
393396
.filter(crate_owners::crate_id.eq(self.id))
397+
.order((crate_owners::owner_id, crate_owners::owner_kind))
394398
.inner_join(teams::table)
395399
.select(Team::as_select())
396400
.load(conn)?

0 commit comments

Comments
 (0)