Skip to content

Commit f4f40d0

Browse files
authored
fix: increase workspace name randomess in tests (coder#7018)
1 parent 0224426 commit f4f40d0

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

coderd/coderdtest/coderdtest.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ func CreateAnotherUser(t *testing.T, client *codersdk.Client, organizationID uui
484484
func createAnotherUserRetry(t *testing.T, client *codersdk.Client, organizationID uuid.UUID, retries int, roles ...string) (*codersdk.Client, codersdk.User) {
485485
req := codersdk.CreateUserRequest{
486486
Email: namesgenerator.GetRandomName(10) + "@coder.com",
487-
Username: randomUsername(),
487+
Username: randomUsername(t),
488488
Password: "SomeSecurePassword!",
489489
OrganizationID: organizationID,
490490
}
@@ -589,8 +589,8 @@ func CreateWorkspaceBuild(
589589
// compatibility with testing. The name assigned is randomly generated.
590590
func CreateTemplate(t *testing.T, client *codersdk.Client, organization uuid.UUID, version uuid.UUID, mutators ...func(*codersdk.CreateTemplateRequest)) codersdk.Template {
591591
req := codersdk.CreateTemplateRequest{
592-
Name: randomUsername(),
593-
Description: randomUsername(),
592+
Name: randomUsername(t),
593+
Description: randomUsername(t),
594594
VersionID: version,
595595
}
596596
for _, mut := range mutators {
@@ -709,7 +709,7 @@ func CreateWorkspace(t *testing.T, client *codersdk.Client, organization uuid.UU
709709
t.Helper()
710710
req := codersdk.CreateWorkspaceRequest{
711711
TemplateID: templateID,
712-
Name: randomUsername(),
712+
Name: randomUsername(t),
713713
AutostartSchedule: ptr.Ref("CRON_TZ=US/Central 30 9 * * 1-5"),
714714
TTLMillis: ptr.Ref((8 * time.Hour).Milliseconds()),
715715
}
@@ -1065,8 +1065,10 @@ func NewAzureInstanceIdentity(t *testing.T, instanceID string) (x509.VerifyOptio
10651065
}
10661066
}
10671067

1068-
func randomUsername() string {
1069-
return strings.ReplaceAll(namesgenerator.GetRandomName(10), "_", "-")
1068+
func randomUsername(t testing.TB) string {
1069+
suffix, err := cryptorand.String(3)
1070+
require.NoError(t, err)
1071+
return strings.ReplaceAll(namesgenerator.GetRandomName(10), "_", "-") + "-" + suffix
10701072
}
10711073

10721074
// Used to easily create an HTTP transport!

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy