fix namespace for test

chatwork · Nov 24, 2023 · a712e53 · a712e53
1 parent c95e753
commit a712e53
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/cmd/cert-manager/cert-manager_test.go b/cmd/cert-manager/cert-manager_test.go
@@ -1,9 +1,12 @@
 package certmanager
 
 import (
+	"fmt"
 	"testing"
+	"time"
 
 	cmapiv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+	"github.com/chatwork/kibertas/util"
 	"github.com/chatwork/kibertas/util/notify"
 	"github.com/sirupsen/logrus"
 
@@ -15,6 +18,7 @@ import (
 )
 
 func TestNewCertManager(t *testing.T) {
+	t.Parallel()
 	logger := func() *logrus.Entry {
 		return logrus.NewEntry(logrus.New())
 	}
@@ -30,6 +34,7 @@ func TestNewCertManager(t *testing.T) {
 }
 
 func TestCheck(t *testing.T) {
+	t.Parallel()
 	logger := func() *logrus.Entry {
 		return logrus.NewEntry(logrus.New())
 	}
@@ -49,8 +54,10 @@ func TestCheck(t *testing.T) {
 
 	chatwork := &notify.Chatwork{ApiToken: "token", RoomId: "test", Logger: logger}
 
+	now := time.Now()
+	namespace := fmt.Sprintf("cert-manager-test-%d%02d%02d-%s", now.Year(), now.Month(), now.Day(), util.GenerateRandomString(5))
 	cm := &CertManager{
-		Checker:  cmd.NewChecker("test", k8sclientset, true, logger, chatwork),
+		Checker:  cmd.NewChecker(namespace, k8sclientset, true, logger, chatwork),
 		CertName: "sample",
 		Client:   k8sclient,
 	}

diff --git a/cmd/datadog-agent/datadog-agent_test.go b/cmd/datadog-agent/datadog-agent_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func TestNewDatadogAgent(t *testing.T) {
+	t.Parallel()
 	logger := func() *logrus.Entry {
 		return logrus.NewEntry(logrus.New())
 	}
@@ -28,6 +29,7 @@ func TestNewDatadogAgent(t *testing.T) {
 }
 
 func TestCheck(t *testing.T) {
+	t.Parallel()
 	logger := func() *logrus.Entry {
 		return logrus.NewEntry(logrus.New())
 	}

diff --git a/cmd/fluent/fluent_test.go b/cmd/fluent/fluent_test.go
@@ -0,0 +1,24 @@
+package fluent
+
+import (
+	"testing"
+
+	"github.com/chatwork/kibertas/util/notify"
+
+	"github.com/sirupsen/logrus"
+)
+
+func TestNewFluent(t *testing.T) {
+	logger := func() *logrus.Entry {
+		return logrus.NewEntry(logrus.New())
+	}
+	chatwork := &notify.Chatwork{}
+	fluent, err := NewFluent(true, logger, chatwork)
+	if err != nil {
+		t.Fatalf("NewFluent: %s", err)
+	}
+
+	if fluent == nil {
+		t.Error("Expected fluent instance, got nil")
+	}
+}
diff --git a/cmd/ingress/ingressCheck_test.go b/cmd/ingress/ingressCheck_test.go
@@ -1,16 +1,20 @@
 package ingress
 
 import (
+	"fmt"
 	"testing"
+	"time"
 
 	"github.com/chatwork/kibertas/cmd"
 	"github.com/chatwork/kibertas/config"
+	"github.com/chatwork/kibertas/util"
 	"github.com/chatwork/kibertas/util/notify"
 
 	"github.com/sirupsen/logrus"
 )
 
 func TestNewIngress(t *testing.T) {
+	t.Parallel()
 	logger := func() *logrus.Entry {
 		return logrus.NewEntry(logrus.New())
 	}
@@ -26,6 +30,7 @@ func TestNewIngress(t *testing.T) {
 }
 
 func TestCheck(t *testing.T) {
+	t.Parallel()
 	logger := func() *logrus.Entry {
 		return logrus.NewEntry(logrus.New())
 	}
@@ -37,10 +42,14 @@ func TestCheck(t *testing.T) {
 
 	chatwork := &notify.Chatwork{ApiToken: "token", RoomId: "test", Logger: logger}
 
+	now := time.Now()
+
+	namespace := fmt.Sprintf("ingress-test-%d%02d%02d-%s", now.Year(), now.Month(), now.Day(), util.GenerateRandomString(5))
+
 	// kindとingress-nginxがある前提
 	// レコードは作れないのでNoDnsCheckをtrueにする
 	ingress := &Ingress{
-		Checker:          cmd.NewChecker("test", k8sclient, true, logger, chatwork),
+		Checker:          cmd.NewChecker(namespace, k8sclient, true, logger, chatwork),
 		NoDnsCheck:       true,
 		IngressClassName: "nginx",
 		ResourceName:     "sample",