validate working with multiple user statuses

johnstcn · johnstcn · commit 39aa29e98141 · 2023-09-15T11:36:59.000+01:00
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -227,7 +227,7 @@ func User(t testing.TB, db database.Store, orig database.User) database.User {
 
 	user, err = db.UpdateUserStatus(genCtx, database.UpdateUserStatusParams{
 		ID:        user.ID,
-		Status:    database.UserStatusActive,
+		Status:    takeFirst(orig.Status, database.UserStatusActive),
 		UpdatedAt: dbtime.Now(),
 	})
 	require.NoError(t, err, "insert user")
diff --git a/enterprise/cli/server_dbcrypt_test.go b/enterprise/cli/server_dbcrypt_test.go
@@ -207,9 +207,17 @@ func TestServerDBCrypt(t *testing.T) {
 func genData(t *testing.T, db database.Store, n int) []database.User {
 	t.Helper()
 	var users []database.User
+	// Make some users
 	for i := 0; i < n; i++ {
+		status := database.UserStatusActive
+		if i%2 == 0 {
+			status = database.UserStatusSuspended
+		} else if i%3 == 0 {
+			status = database.UserStatusDormant
+		}
 		usr := dbgen.User(t, db, database.User{
 			LoginType: database.LoginTypeOIDC,
+			Status:    status,
 		})
 		_ = dbgen.UserLink(t, db, database.UserLink{
 			UserID:            usr.ID,
