From e1f5eb1ceaa7ccc1d1ff48e62ac54d378c69d34b Mon Sep 17 00:00:00 2001
From: Neil Schark <neil.schark@h-da.de>
Date: Wed, 6 Mar 2024 12:05:03 +0000
Subject: [PATCH] hopefully fix application tests
---
.gitlab/ci/.test.yml | 2 +-
integration-tests/application_tests/application_test.go | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitlab/ci/.test.yml b/.gitlab/ci/.test.yml
index 3353be299..20cd508b9 100644
--- a/.gitlab/ci/.test.yml
+++ b/.gitlab/ci/.test.yml
@@ -12,7 +12,7 @@ integration-test-gosdn:
INTEGRATION_TEST_TARGET_A: gnmi-target_A:7030
INTEGRATION_TEST_TARGET_B: gnmi-target_B:7030
INTEGRATION_TEST_RABBITMQ_HOSTNAME: rabbitmq
- INTEGRATION_TEST_CONTROLLER_URL: gosdn
+ INTEGRATION_TEST_CONTROLLER_URL: gosdn:55055
services:
- name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/mongo:7
alias: mongo
diff --git a/integration-tests/application_tests/application_test.go b/integration-tests/application_tests/application_test.go
index 8d29d82d2..926f4d68c 100644
--- a/integration-tests/application_tests/application_test.go
+++ b/integration-tests/application_tests/application_test.go
@@ -12,7 +12,6 @@ import (
tpb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/transport"
"code.fbi.h-da.de/danet/gosdn/application-framework/event"
integration_test_utils "code.fbi.h-da.de/danet/gosdn/integration-tests/integrationTestUtils"
- "github.com/sirupsen/logrus"
"google.golang.org/grpc"
)
@@ -67,9 +66,13 @@ func TestMain(m *testing.M) {
rabbitMQAddress = envVarRabbitmq
}
- logrus.Infof("RabbitMQ address: %s", rabbitMQAddress)
+ controllerUrl := "localhost:55055"
+ controllerEnv := os.Getenv("INTEGRATION_TEST_CONTROLLER_URL")
+ if controllerEnv != "" {
+ controllerUrl = controllerEnv
+ }
- application = NewApplication(ctx, conn, ":55055", topics, rabbitMQAddress)
+ application = NewApplication(ctx, conn, controllerUrl, topics, rabbitMQAddress)
eventTypeCallbackTuples := []event.TypeToCallbackTuple{
{
--
GitLab