From 0cc26e0104fc720d6b06733f5fa684d07f28677c Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <manuel.kieweg@h-da.de>
Date: Tue, 1 Jun 2021 17:45:18 +0200
Subject: [PATCH] switch http test and controller test
---
build/cd/deploy.go | 10 +++++-----
controller_test.go | 11 -----------
http_test.go | 3 +++
3 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/build/cd/deploy.go b/build/cd/deploy.go
index 85bbeee80..121bd08a7 100644
--- a/build/cd/deploy.go
+++ b/build/cd/deploy.go
@@ -144,9 +144,9 @@ func update(clientset *kubernetes.Clientset, resource metav1.Common, env string)
opts := metav1.UpdateOptions{}
getOpts := metav1.GetOptions{}
ctx := context.Background()
- switch resource.(type) {
+ switch resource := resource.(type) {
case *corev1.Service:
- service := resource.(*corev1.Service)
+ service := resource
s, err := clientset.CoreV1().Services("cocsn").Get(ctx, env, getOpts)
if err != nil {
return err
@@ -158,7 +158,7 @@ func update(clientset *kubernetes.Clientset, resource metav1.Common, env string)
}
log.Printf("service %v updated", service.Name)
case *netv1.Ingress:
- ingress := resource.(*netv1.Ingress)
+ ingress := resource
i, err := clientset.NetworkingV1beta1().Ingresses("cocsn").Get(ctx, env, getOpts)
if err != nil {
return err
@@ -170,7 +170,7 @@ func update(clientset *kubernetes.Clientset, resource metav1.Common, env string)
}
log.Printf("ingress %v updated", ingress.Name)
case *corev1.ConfigMap:
- config := resource.(*corev1.ConfigMap)
+ config := resource
c, err := clientset.CoreV1().ConfigMaps("cocsn").Get(ctx, env+"-config", getOpts)
if err != nil {
return err
@@ -182,7 +182,7 @@ func update(clientset *kubernetes.Clientset, resource metav1.Common, env string)
}
log.Printf("configMap %v updated", config.Name)
case *appv1.Deployment:
- deployment := resource.(*appv1.Deployment)
+ deployment := resource
d, err := clientset.AppsV1().Deployments("cocsn").Get(ctx, env, getOpts)
if err != nil {
return err
diff --git a/controller_test.go b/controller_test.go
index eb90405e9..79d7cc8bc 100644
--- a/controller_test.go
+++ b/controller_test.go
@@ -9,9 +9,6 @@ import (
)
func TestRun(t *testing.T) {
- if testing.Short() {
- t.Skip("this test is executed separately")
- }
type args struct {
request string
}
@@ -55,14 +52,6 @@ func TestRun(t *testing.T) {
if !reflect.DeepEqual(got.StatusCode, tests[1].want) {
t.Errorf("readyz got: %v, want %v", got.StatusCode, tests[1].want)
}
- got, err = http.Get(tests[2].args.request)
- if err != nil {
- t.Error(err)
- return
- }
- if !reflect.DeepEqual(got.StatusCode, tests[2].want) {
- t.Errorf("api init got: %v, want %v", got.StatusCode, tests[2].want)
- }
})
cancel()
diff --git a/http_test.go b/http_test.go
index 94092e1ca..1d1d311bc 100644
--- a/http_test.go
+++ b/http_test.go
@@ -6,6 +6,9 @@ import (
)
func Test_httpApi(t *testing.T) {
+ if testing.Short() {
+ t.Skip("this test is executed separately")
+ }
tests := []struct {
name string
request string
--
GitLab