revert ci test changes

integration-tests/application_tests/appUtility_test.go

@@ -6,7 +6,6 @@ import (
 	"os/signal"
 	"strings"
 	"syscall"
-	"time"
 
 	"code.fbi.h-da.de/danet/gosdn/application-framework/event"
 	"code.fbi.h-da.de/danet/gosdn/application-framework/registration"
@@ -56,7 +55,6 @@ func NewApplication(ctx context.Context, grpcClientConn *grpc.ClientConn, contro
 func (a *Application) Run(eventTypeCallbackTuples []event.TypeToCallbackTuple) {
 	signal.Notify(a.stopChannel, os.Interrupt, syscall.SIGTERM)
 
-	time.Sleep(5 * time.Second)
 	a.eventService.SubscribeToEventType(eventTypeCallbackTuples)
 	a.eventService.SetupEventReciever(a.stopChannel)
 

integration-tests/application_tests/application_test.go

@@ -99,8 +99,6 @@ func TestMain(m *testing.M) {
 	if os.Getenv("RABBITMQ") == "" {
 		_ = <-application.eventChannel
 		_ = <-application.eventChannel
-	} else {
-		integration_test_utils.ClearRabbitMQQueues()
 	}
 
 	m.Run()

integration-tests/integrationTestUtils/integrationTestUtils.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"os/exec"
 	"time"
 
 	configMgmtPb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/configurationmanagement"
@@ -193,38 +192,3 @@ func cleanRolesExceptAdmin(resp *apb.GetRolesResponse, roleService apb.RoleServi
 
 	return nil
 }
-
-func ClearRabbitMQQueues() {
-	rabbitMQAddress := "localhost"
-	envVarRabbitmq := os.Getenv("RABBITMQ")
-	if envVarRabbitmq != "" {
-		rabbitMQAddress = envVarRabbitmq
-	}
-
-	// add more queue names if necessary
-	queues := []string{
-		"user",
-		"role",
-		"managedNetworkElement",
-	}
-
-	for _, queue := range queues {
-		args := []string{
-			"-i",
-			"-u", "guest:guest",
-			"-H", "\"content-type:application/json\"",
-			"-X", "POST",
-			"http://" + rabbitMQAddress + ":15672/api/queues/%2f/" + queue + "/get",
-			"-d", "{\"count\":10,\"encoding\":\"auto\",\"truncate\":50000,\"ackmode\":\"ack_requeue_false\"}",
-		}
-
-		cmd := exec.Command("curl", args...)
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-
-		err := cmd.Run()
-		if err != nil {
-			logrus.Info(err)
-		}
-	}
-}