chore(enterprise/cli): fix test flake in TestServerDBCrypt (#10222)

* increase randomness in names generated by server dbcrypt

* more randomness

* close PTYs when we are done with them
This commit is contained in:
Cian Johnston
2023-10-11 17:38:20 +01:00
committed by GitHub
parent 04e67836a5
commit 59ae69b7f2
+8
View File
@@ -79,6 +79,7 @@ func TestServerDBCrypt(t *testing.T) {
inv.Stdout = pty.Output()
err = inv.Run()
require.NoError(t, err)
require.NoError(t, pty.Close())
// Validate that all existing data has been encrypted with cipher A.
for _, usr := range users {
@@ -101,6 +102,7 @@ func TestServerDBCrypt(t *testing.T) {
inv.Stdout = pty.Output()
err = inv.Run()
require.NoError(t, err)
require.NoError(t, pty.Close())
// Validate that all data has been re-encrypted with cipher B.
for _, usr := range users {
@@ -142,6 +144,7 @@ func TestServerDBCrypt(t *testing.T) {
inv.Stdout = pty.Output()
err = inv.Run()
require.NoError(t, err)
require.NoError(t, pty.Close())
// Validate that both keys have been revoked.
keys, err = db.GetDBCryptKeys(ctx)
@@ -172,6 +175,7 @@ func TestServerDBCrypt(t *testing.T) {
inv.Stdout = pty.Output()
err = inv.Run()
require.NoError(t, err)
require.NoError(t, pty.Close())
// Validate that all data has been re-encrypted with cipher C.
for _, usr := range users {
@@ -189,6 +193,7 @@ func TestServerDBCrypt(t *testing.T) {
inv.Stdout = pty.Output()
err = inv.Run()
require.NoError(t, err)
require.NoError(t, pty.Close())
// Assert that no user links remain.
for _, usr := range users {
@@ -217,7 +222,10 @@ func genData(t *testing.T, db database.Store) []database.User {
for _, status := range database.AllUserStatusValues() {
for _, loginType := range database.AllLoginTypeValues() {
for _, deleted := range []bool{false, true} {
randName := mustString(t, 32)
usr := dbgen.User(t, db, database.User{
Username: randName,
Email: randName + "@notcoder.com",
LoginType: loginType,
Status: status,
Deleted: deleted,