Skip to content

Commit 66fc096

Browse files
jespinojespino
authored
MM-22340: Fixing flaky tests around Team name validation (mattermost#13875)
* MM-22340: Fixing flaky tests around Team name validation * Fixing other cases where can happend the flaky tests
1 parent 35ac262 commit 66fc096

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎api4/scheme_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ func TestDeleteScheme(t *testing.T) {
621621

622622
// Make sure this scheme is in use by a team.
623623
team, err := th.App.Srv.Store.Team().Save(&model.Team{
624-
Name: model.NewId(),
624+
Name: "zz" + model.NewId(),
625625
DisplayName: model.NewId(),
626626
Email: model.NewId() + "@nowhere.com",
627627
Type: model.TEAM_OPEN,

‎app/syncables_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func TestCreateDefaultMemberships(t *testing.T) {
1616

1717
singersTeam, err := th.App.CreateTeam(&model.Team{
1818
DisplayName: "Singers",
19-
Name: model.NewId(),
19+
Name: "zz" + model.NewId(),
2020
Email: "[email protected]",
2121
Type: model.TEAM_OPEN,
2222
})
@@ -26,7 +26,7 @@ func TestCreateDefaultMemberships(t *testing.T) {
2626

2727
nerdsTeam, err := th.App.CreateTeam(&model.Team{
2828
DisplayName: "Nerds",
29-
Name: model.NewId(),
29+
Name: "zz" + model.NewId(),
3030
Email: "[email protected]",
3131
Type: model.TEAM_INVITE,
3232
})

‎manualtesting/manual_testing.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func manualTest(c *web.Context, w http.ResponseWriter, r *http.Request) {
7070
// Create team for testing
7171
team := &model.Team{
7272
DisplayName: teamDisplayName[0],
73-
Name: utils.RandomName(utils.Range{Begin: 20, End: 20}, utils.LOWERCASE),
73+
Name: "zz" + utils.RandomName(utils.Range{Begin: 20, End: 20}, utils.LOWERCASE),
7474
Email: "success+" + model.NewId() + "simulator.amazonses.com",
7575
Type: model.TEAM_OPEN,
7676
}

‎store/storetest/group_store.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -2271,7 +2271,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) {
22712271
CompanyName: model.NewId(),
22722272
AllowOpenInvite: false,
22732273
InviteId: model.NewId(),
2274-
Name: model.NewId(),
2274+
Name: "zz" + model.NewId(),
22752275
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
22762276
Type: model.TEAM_OPEN,
22772277
}
@@ -2322,7 +2322,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) {
23222322
CompanyName: model.NewId(),
23232323
AllowOpenInvite: false,
23242324
InviteId: model.NewId(),
2325-
Name: model.NewId(),
2325+
Name: "zz" + model.NewId(),
23262326
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
23272327
Type: model.TEAM_INVITE,
23282328
}
@@ -2505,7 +2505,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
25052505
CompanyName: model.NewId(),
25062506
AllowOpenInvite: false,
25072507
InviteId: model.NewId(),
2508-
Name: model.NewId(),
2508+
Name: "zz" + model.NewId(),
25092509
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
25102510
Type: model.TEAM_OPEN,
25112511
}
@@ -2566,7 +2566,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
25662566
CompanyName: model.NewId(),
25672567
AllowOpenInvite: false,
25682568
InviteId: model.NewId(),
2569-
Name: model.NewId(),
2569+
Name: "zz" + model.NewId(),
25702570
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
25712571
Type: model.TEAM_INVITE,
25722572
}
@@ -2811,7 +2811,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) {
28112811
CompanyName: model.NewId(),
28122812
AllowOpenInvite: false,
28132813
InviteId: model.NewId(),
2814-
Name: model.NewId(),
2814+
Name: "zz" + model.NewId(),
28152815
Email: model.NewId() + "@simulator.amazonses.com",
28162816
Type: model.TEAM_OPEN,
28172817
GroupConstrained: model.NewBool(true),
@@ -3279,7 +3279,7 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, ss store.Store)
32793279

32803280
team := &model.Team{
32813281
DisplayName: "A Name",
3282-
Name: model.NewId(),
3282+
Name: "zz" + model.NewId(),
32833283
Type: model.CHANNEL_OPEN,
32843284
}
32853285
team, err = ss.Team().Save(team)
@@ -3382,7 +3382,7 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, ss store.Store) {
33823382

33833383
team := &model.Team{
33843384
DisplayName: "A Name",
3385-
Name: model.NewId(),
3385+
Name: "zz" + model.NewId(),
33863386
Type: model.CHANNEL_OPEN,
33873387
}
33883388
team, err = ss.Team().Save(team)
@@ -3809,7 +3809,7 @@ func groupTestGroupTeamCount(t *testing.T, ss store.Store) {
38093809
Description: model.NewId(),
38103810
AllowOpenInvite: false,
38113811
InviteId: model.NewId(),
3812-
Name: model.NewId(),
3812+
Name: "zz" + model.NewId(),
38133813
Email: model.NewId() + "@simulator.amazonses.com",
38143814
Type: model.TEAM_OPEN,
38153815
})

‎store/storetest/team_store.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -1337,23 +1337,23 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
13371337

13381338
// Create and save some teams.
13391339
t1 := &model.Team{
1340-
Name: model.NewId(),
1340+
Name: "zz" + model.NewId(),
13411341
DisplayName: model.NewId(),
13421342
Email: MakeEmail(),
13431343
Type: model.TEAM_OPEN,
13441344
SchemeId: &s1.Id,
13451345
}
13461346

13471347
t2 := &model.Team{
1348-
Name: model.NewId(),
1348+
Name: "zz" + model.NewId(),
13491349
DisplayName: model.NewId(),
13501350
Email: MakeEmail(),
13511351
Type: model.TEAM_OPEN,
13521352
SchemeId: &s1.Id,
13531353
}
13541354

13551355
t3 := &model.Team{
1356-
Name: model.NewId(),
1356+
Name: "zz" + model.NewId(),
13571357
DisplayName: model.NewId(),
13581358
Email: MakeEmail(),
13591359
Type: model.TEAM_OPEN,
@@ -1464,15 +1464,15 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) {
14641464
require.Nil(t, err)
14651465

14661466
t1 := &model.Team{
1467-
Name: model.NewId(),
1467+
Name: "zz" + model.NewId(),
14681468
DisplayName: model.NewId(),
14691469
Email: MakeEmail(),
14701470
Type: model.TEAM_OPEN,
14711471
SchemeId: &s1.Id,
14721472
}
14731473

14741474
t2 := &model.Team{
1475-
Name: model.NewId(),
1475+
Name: "zz" + model.NewId(),
14761476
DisplayName: model.NewId(),
14771477
Email: MakeEmail(),
14781478
Type: model.TEAM_OPEN,
@@ -1565,7 +1565,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
15651565
assert.Equal(t, int64(0), count1)
15661566

15671567
t1 := &model.Team{
1568-
Name: model.NewId(),
1568+
Name: "zz" + model.NewId(),
15691569
DisplayName: model.NewId(),
15701570
Email: MakeEmail(),
15711571
Type: model.TEAM_OPEN,
@@ -1579,7 +1579,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
15791579
assert.Equal(t, int64(1), count2)
15801580

15811581
t2 := &model.Team{
1582-
Name: model.NewId(),
1582+
Name: "zz" + model.NewId(),
15831583
DisplayName: model.NewId(),
15841584
Email: MakeEmail(),
15851585
Type: model.TEAM_OPEN,
@@ -1593,7 +1593,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
15931593
assert.Equal(t, int64(2), count3)
15941594

15951595
t3 := &model.Team{
1596-
Name: model.NewId(),
1596+
Name: "zz" + model.NewId(),
15971597
DisplayName: model.NewId(),
15981598
Email: MakeEmail(),
15991599
Type: model.TEAM_OPEN,
@@ -1606,7 +1606,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
16061606
assert.Equal(t, int64(2), count4)
16071607

16081608
t4 := &model.Team{
1609-
Name: model.NewId(),
1609+
Name: "zz" + model.NewId(),
16101610
DisplayName: model.NewId(),
16111611
Email: MakeEmail(),
16121612
Type: model.TEAM_OPEN,
@@ -1688,7 +1688,7 @@ func testTeamStoreGetTeamMembersForExport(t *testing.T, ss store.Store) {
16881688
func testGroupSyncedTeamCount(t *testing.T, ss store.Store) {
16891689
team1, err := ss.Team().Save(&model.Team{
16901690
DisplayName: model.NewId(),
1691-
Name: model.NewId(),
1691+
Name: "zz" + model.NewId(),
16921692
Email: MakeEmail(),
16931693
Type: model.TEAM_INVITE,
16941694
GroupConstrained: model.NewBool(true),
@@ -1699,7 +1699,7 @@ func testGroupSyncedTeamCount(t *testing.T, ss store.Store) {
16991699

17001700
team2, err := ss.Team().Save(&model.Team{
17011701
DisplayName: model.NewId(),
1702-
Name: model.NewId(),
1702+
Name: "zz" + model.NewId(),
17031703
Email: MakeEmail(),
17041704
Type: model.TEAM_INVITE,
17051705
})

‎store/storetest/user_store.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3535,7 +3535,7 @@ func testUserStoreAnalyticsGetSystemAdminCount(t *testing.T, ss store.Store) {
35353535
func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) {
35363536
team, err := ss.Team().Save(&model.Team{
35373537
DisplayName: "Team",
3538-
Name: model.NewId(),
3538+
Name: "zz" + model.NewId(),
35393539
Type: model.TEAM_OPEN,
35403540
})
35413541
require.Nil(t, err)
@@ -3847,7 +3847,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) {
38473847
// Set up all the objects needed
38483848
t1, err := ss.Team().Save(&model.Team{
38493849
DisplayName: "Team1",
3850-
Name: model.NewId(),
3850+
Name: "zz" + model.NewId(),
38513851
Type: model.TEAM_OPEN,
38523852
})
38533853
require.Nil(t, err)

0 commit comments

Comments
 (0)