From ae08d0fa44d7603f994b109561135fa149b53f89 Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <manuel.kieweg@h-da.de>
Date: Mon, 29 Mar 2021 15:01:30 +0100
Subject: [PATCH] merge
---
nucleus/controller.go | 1 +
nucleus/http_test.go | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/nucleus/controller.go b/nucleus/controller.go
index a633e4168..e8fb8413c 100644
--- a/nucleus/controller.go
+++ b/nucleus/controller.go
@@ -47,6 +47,7 @@ func initialize() error {
}
// TODO: Start grpc listener here
+
return httpAPI()
}
diff --git a/nucleus/http_test.go b/nucleus/http_test.go
index 00195b43e..35ce78254 100644
--- a/nucleus/http_test.go
+++ b/nucleus/http_test.go
@@ -36,10 +36,6 @@ func testSetupHTTP() {
if err := c.pndc.add(pnd); err != nil {
log.Fatal(err)
}
- if err := httpAPI(); err != nil {
- log.Fatal(err)
- return
- }
}
func Test_httpApi(t *testing.T) {
@@ -141,6 +137,10 @@ func Test_httpApi(t *testing.T) {
wantErr: false,
},
}
+ if err := httpAPI(); err != nil {
+ t.Errorf("httpApi() error = %v", err)
+ return
+ }
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := http.Get(tt.request)
--
GitLab