From 9a9af2ded3c3f9cbd8c66beea238002ce0e70b65 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Thu, 11 Jan 2024 13:54:21 +0100
Subject: [PATCH] fix role tests blocking when reading
---
.../application_tests/application_test.go | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/integration-tests/application_tests/application_test.go b/integration-tests/application_tests/application_test.go
index 020dd62fa..2b40a5844 100644
--- a/integration-tests/application_tests/application_test.go
+++ b/integration-tests/application_tests/application_test.go
@@ -61,7 +61,7 @@ func TestMain(m *testing.M) {
defer integration_test_utils.ApplySDNConfig(conn, ctx, defaultSDNConfig)
defer integration_test_utils.CleanUserAndRolesExceptAdmin(conn, ctx)
- topics := []event.Topic{event.ManagedNetworkElement, event.User}
+ topics := []event.Topic{event.ManagedNetworkElement, event.User, event.Role}
rabbitMQAddress := ""
envVarRabbitmq := os.Getenv("RABBITMQ")
@@ -99,6 +99,7 @@ func TestMain(m *testing.M) {
if os.Getenv("RABBITMQ") == "" {
_ = <-application.eventChannel
_ = <-application.eventChannel
+ _ = <-application.eventChannel
}
m.Run()
@@ -239,9 +240,9 @@ func TestRoleAddAndDeleteEvent(t *testing.T) {
t.FailNow()
}
- // addEvent := <-application.eventChannel
- // assert.Equal(t, event.Add.String(), addEvent.Type)
- // assert.Equal(t, roleID, addEvent.EntityID.String())
+ addEvent := <-application.eventChannel
+ assert.Equal(t, event.Add.String(), addEvent.Type)
+ assert.Equal(t, roleID, addEvent.EntityID.String())
// delete new role and check for event
_, err = roleService.DeleteRoles(ctx, deleteRoleRequest)
@@ -250,7 +251,7 @@ func TestRoleAddAndDeleteEvent(t *testing.T) {
t.FailNow()
}
- // deleteEvent := <-application.eventChannel
- // assert.Equal(t, event.Delete.String(), deleteEvent.Type)
- // assert.Equal(t, roleID, addEvent.EntityID.String())
+ deleteEvent := <-application.eventChannel
+ assert.Equal(t, event.Delete.String(), deleteEvent.Type)
+ assert.Equal(t, roleID, deleteEvent.EntityID.String())
}
--
GitLab