Skip to content

Commit 095aa37

Browse files
authored
fix: flaky tests (#168)
1 parent e2fd0cf commit 095aa37

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

keycloak/role.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package keycloak
22

33
import (
44
"fmt"
5+
"log"
56
)
67

78
type Role struct {
@@ -91,7 +92,14 @@ func (keycloakClient *KeycloakClient) UpdateRole(role *Role) error {
9192
}
9293

9394
func (keycloakClient *KeycloakClient) DeleteRole(realmId, id string) error {
94-
return keycloakClient.delete(fmt.Sprintf("/realms/%s/roles-by-id/%s", realmId, id), nil)
95+
err := keycloakClient.delete(fmt.Sprintf("/realms/%s/roles-by-id/%s", realmId, id), nil)
96+
if err != nil {
97+
log.Printf("[DEBUG] Failed to delete role with id %s. Trying again...", id)
98+
99+
return keycloakClient.delete(fmt.Sprintf("/realms/%s/roles-by-id/%s", realmId, id), nil)
100+
}
101+
102+
return nil
95103
}
96104

97105
func (keycloakClient *KeycloakClient) AddCompositesToRole(role *Role, compositeRoles []*Role) error {

provider/resource_keycloak_ldap_user_federation_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ func TestAccKeycloakLdapUserFederation_basicUpdateAll(t *testing.T) {
128128
firstValidatePasswordPolicy := randomBool()
129129
firstPagination := randomBool()
130130

131-
firstConnectionTimeout, _ := keycloak.GetDurationStringFromMilliseconds(strconv.Itoa(acctest.RandIntRange(1000, 3600000)))
132-
secondConnectionTimeout, _ := keycloak.GetDurationStringFromMilliseconds(strconv.Itoa(acctest.RandIntRange(1000, 3600000)))
133-
firstReadTimeout, _ := keycloak.GetDurationStringFromMilliseconds(strconv.Itoa(acctest.RandIntRange(1000, 3600000)))
134-
secondReadTimeout, _ := keycloak.GetDurationStringFromMilliseconds(strconv.Itoa(acctest.RandIntRange(1000, 3600000)))
131+
firstConnectionTimeout, _ := keycloak.GetDurationStringFromMilliseconds(strconv.Itoa(acctest.RandIntRange(1, 3600) * 1000))
132+
secondConnectionTimeout, _ := keycloak.GetDurationStringFromMilliseconds(strconv.Itoa(acctest.RandIntRange(1, 3600) * 1000))
133+
firstReadTimeout, _ := keycloak.GetDurationStringFromMilliseconds(strconv.Itoa(acctest.RandIntRange(1, 3600) * 1000))
134+
secondReadTimeout, _ := keycloak.GetDurationStringFromMilliseconds(strconv.Itoa(acctest.RandIntRange(1, 3600) * 1000))
135135

136136
firstLdap := &keycloak.LdapUserFederation{
137137
RealmId: realmName,

0 commit comments

Comments
 (0)