From 5ac4a96746909f04dffa93e1f678f8cd1fd691a3 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Wed, 26 May 2021 18:30:01 +0200
Subject: [PATCH] fix discovery tests
---
.../src/asapo_discovery/common/consts.go | 2 +-
.../request_handler/request_handler_consul.go | 2 +-
.../request_handler_consul_test.go | 19 ++++++++++---------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/discovery/src/asapo_discovery/common/consts.go b/discovery/src/asapo_discovery/common/consts.go
index e43ea3b1e..46cf71dcd 100644
--- a/discovery/src/asapo_discovery/common/consts.go
+++ b/discovery/src/asapo_discovery/common/consts.go
@@ -1,6 +1,6 @@
package common
-const (
+var (
NameMongoService = "asapo-mongodb"
NameFtsService = "asapo-file-transfer"
NameBrokerService = "asapo-broker"
diff --git a/discovery/src/asapo_discovery/request_handler/request_handler_consul.go b/discovery/src/asapo_discovery/request_handler/request_handler_consul.go
index 9db9cb5ee..a8180db15 100644
--- a/discovery/src/asapo_discovery/request_handler/request_handler_consul.go
+++ b/discovery/src/asapo_discovery/request_handler/request_handler_consul.go
@@ -67,7 +67,7 @@ func (rh *ConsulRequestHandler) GetReceivers(use_ib bool) ([]byte, error) {
return nil, errors.New("consul client not connected")
}
var err error
- response.Uris, err = rh.GetServices("asapo-receiver",use_ib)
+ response.Uris, err = rh.GetServices(common.NameReceiverService,use_ib)
if err != nil {
return nil, err
}
diff --git a/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go b/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go
index 516928011..44b6b7b10 100644
--- a/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go
+++ b/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go
@@ -48,16 +48,17 @@ func (suite *ConsulHandlerTestSuite) SetupTest() {
if err != nil {
panic(err)
}
-
- suite.registerAgents("asapo-receiver")
- suite.registerAgents("asapo-broker")
+ common.NameReceiverService = "asapo-receiver-test"
+ common.NameBrokerService = "asapo-broker-test"
+ suite.registerAgents("asapo-receiver-test")
+ suite.registerAgents("asapo-broker-test")
}
func (suite *ConsulHandlerTestSuite) TearDownTest() {
- suite.client.Agent().ServiceDeregister("asapo-receiver1234")
- suite.client.Agent().ServiceDeregister("asapo-receiver1235")
- suite.client.Agent().ServiceDeregister("asapo-broker1234")
- suite.client.Agent().ServiceDeregister("asapo-broker1235")
+ suite.client.Agent().ServiceDeregister("asapo-receiver-test1234")
+ suite.client.Agent().ServiceDeregister("asapo-receiver-test1235")
+ suite.client.Agent().ServiceDeregister("asapo-broker-test1234")
+ suite.client.Agent().ServiceDeregister("asapo-broker-test1235")
}
func (suite *ConsulHandlerTestSuite) TestInitDefaultUri() {
@@ -154,8 +155,8 @@ func (suite *ConsulHandlerTestSuite) TestGetBrokerStatic() {
}
func (suite *ConsulHandlerTestSuite) TestGetBrokerEmpty() {
- suite.client.Agent().ServiceDeregister("asapo-broker1234")
- suite.client.Agent().ServiceDeregister("asapo-broker1235")
+ suite.client.Agent().ServiceDeregister("asapo-broker-test1234")
+ suite.client.Agent().ServiceDeregister("asapo-broker-test1235")
suite.handler.Init(consul_settings)
res, err := suite.handler.GetSingleService(common.NameBrokerService)
--
GitLab