fix flaky test

superfly · Aug 23, 2024 · 6f1c90d · 6f1c90d
1 parent d2a4b8d
commit 6f1c90d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/flyio/caveats.go b/flyio/caveats.go
@@ -286,6 +286,7 @@ func (r Role) String() string {
 			combined |= namedRole
 
 			if combined == r {
+				slices.Sort(names) // for consistency in tests
 				return strings.Join(names, "+")
 			}
 		}

diff --git a/flyio/caveats_test.go b/flyio/caveats_test.go
@@ -136,7 +136,7 @@ func TestAllowedRoles(t *testing.T) {
 func TestRole(t *testing.T) {
 	assert.Equal(t, "admin", RoleAdmin.String())
 	assert.Equal(t, "member", RoleMember.String())
-	assert.Equal(t, "member+billing_manager", (RoleMember | RoleBillingManager).String())
+	assert.Equal(t, "billing_manager+member", (RoleMember | RoleBillingManager).String())
 
 	assert.True(t, RoleAdmin.HasAllRoles(RoleAdmin))
 	assert.True(t, RoleAdmin.HasAllRoles(RoleMember))