From 469e49c8e34803ad67150bbac365688788c250a3 Mon Sep 17 00:00:00 2001 From: liukuo Date: Fri, 12 Jul 2024 09:52:16 +0800 Subject: [PATCH] fix go test port conflicts and uninitialized configuration parameters --- cmd/command/log_test.go | 4 ++++ pkg/cert/GenerateAllFiles_test.go | 2 +- pkg/configmanager/manager_test.go | 6 ++++++ pkg/httpserver/httpserver_test.go | 8 ++++---- pkg/osmanager/bootconfig/cloudinit/cloudinit_test.go | 4 ++++ pkg/osmanager/bootconfig/ignition/ignition_test.go | 5 ++++- pkg/osmanager/bootconfig/kickstart/kickstart_test.go | 6 +++++- pkg/osmanager/bootconfig/tools_test.go | 2 +- pkg/osmanager/generalos/generalos_test.go | 2 +- pkg/osmanager/nestos/nestos_test.go | 2 +- pkg/osmanager/osmanager_test.go | 2 +- pkg/utils/utils_test.go | 2 +- 12 files changed, 33 insertions(+), 12 deletions(-) diff --git a/cmd/command/log_test.go b/cmd/command/log_test.go index 85e8876..b439ee6 100644 --- a/cmd/command/log_test.go +++ b/cmd/command/log_test.go @@ -17,6 +17,7 @@ package command import ( "bytes" + "os" "strings" "testing" @@ -42,5 +43,8 @@ func TestLoggerHookFire(t *testing.T) { func TestSetuploggerHook(t *testing.T) { restore := SetuploggerHook("sss") + if err := os.RemoveAll("sss"); err != nil { + t.Logf("Failed to remove cluster folder: %v", err) + } defer restore() } diff --git a/pkg/cert/GenerateAllFiles_test.go b/pkg/cert/GenerateAllFiles_test.go index d2f66b6..05170c8 100644 --- a/pkg/cert/GenerateAllFiles_test.go +++ b/pkg/cert/GenerateAllFiles_test.go @@ -54,7 +54,7 @@ func TestOsmanager(t *testing.T) { PersistDir: "/", BootstrapUrl: globalconfig.BootstrapUrl{ BootstrapIgnHost: "127.0.0.1", - BootstrapIgnPort: "9080", + BootstrapIgnPort: "1234", }, } diff --git a/pkg/configmanager/manager_test.go b/pkg/configmanager/manager_test.go index 4d44170..67a2dcc 100644 --- a/pkg/configmanager/manager_test.go +++ b/pkg/configmanager/manager_test.go @@ -18,6 +18,7 @@ package configmanager import ( "nestos-kubernetes-deployer/cmd/command/opts" "nestos-kubernetes-deployer/pkg/configmanager/asset" + "nestos-kubernetes-deployer/pkg/configmanager/globalconfig" "testing" ) @@ -84,6 +85,11 @@ func TestConfigmanager(t *testing.T) { }, } + gc, err := globalconfig.InitGlobalConfig(opts) + if err != nil || gc == nil { + t.Fatalf("InitGlobalConfig returned an error: %v", err) + } + clusterconfig, err := GetClusterConfig("cluster") if err != nil { t.Fatal(err) diff --git a/pkg/httpserver/httpserver_test.go b/pkg/httpserver/httpserver_test.go index dd70207..784613d 100644 --- a/pkg/httpserver/httpserver_test.go +++ b/pkg/httpserver/httpserver_test.go @@ -25,7 +25,7 @@ import ( ) func TestHTTPServer(t *testing.T) { - hs := NewHTTPService("9080") + hs := NewHTTPService("1234") t.Run("TestAddFileToCache", func(t *testing.T) { var content = []byte("test") @@ -85,19 +85,19 @@ func TestHTTPServer(t *testing.T) { }() time.Sleep(1 * time.Second) - _, err := http.Get("http://localhost:9080/testfile") + _, err := http.Get("http://localhost:1234/testfile") if err != nil { t.Log("test fail", err) return } - _, err = http.Get("http://localhost:9080/dir" + os.TempDir()) + _, err = http.Get("http://localhost:1234/dir" + os.TempDir()) if err != nil { t.Log("test fail", err) return } - _, err = http.Get("http://localhost:9080" + constants.RpmPackageList) + _, err = http.Get("http://localhost:1234" + constants.RpmPackageList) if err != nil { t.Log("test fail", err) return diff --git a/pkg/osmanager/bootconfig/cloudinit/cloudinit_test.go b/pkg/osmanager/bootconfig/cloudinit/cloudinit_test.go index c00572c..0261fcd 100644 --- a/pkg/osmanager/bootconfig/cloudinit/cloudinit_test.go +++ b/pkg/osmanager/bootconfig/cloudinit/cloudinit_test.go @@ -85,5 +85,9 @@ func TestCloudinit(t *testing.T) { return } t.Log("success") + + if err := os.RemoveAll(clusterAsset.ClusterID); err != nil { + t.Logf("Failed to remove cluster folder: %v", err) + } }) } diff --git a/pkg/osmanager/bootconfig/ignition/ignition_test.go b/pkg/osmanager/bootconfig/ignition/ignition_test.go index e3e186a..fe02fe1 100644 --- a/pkg/osmanager/bootconfig/ignition/ignition_test.go +++ b/pkg/osmanager/bootconfig/ignition/ignition_test.go @@ -52,7 +52,7 @@ func TestIgnition(t *testing.T) { PersistDir: "./", BootstrapUrl: globalconfig.BootstrapUrl{ BootstrapIgnHost: "127.0.0.1", - BootstrapIgnPort: "9080", + BootstrapIgnPort: "1234", }, } @@ -66,6 +66,9 @@ func TestIgnition(t *testing.T) { return } t.Log("success") + if err := os.RemoveAll(clusterAsset.ClusterID); err != nil { + t.Logf("Failed to remove cluster folder: %v", err) + } }) t.Run("GenerateBootConfig_fail", func(t *testing.T) { diff --git a/pkg/osmanager/bootconfig/kickstart/kickstart_test.go b/pkg/osmanager/bootconfig/kickstart/kickstart_test.go index 3683dd9..d271ad1 100644 --- a/pkg/osmanager/bootconfig/kickstart/kickstart_test.go +++ b/pkg/osmanager/bootconfig/kickstart/kickstart_test.go @@ -52,7 +52,7 @@ func TestKickstart(t *testing.T) { PersistDir: "./", BootstrapUrl: globalconfig.BootstrapUrl{ BootstrapIgnHost: "127.0.0.1", - BootstrapIgnPort: "9080", + BootstrapIgnPort: "1234", }, } @@ -66,6 +66,10 @@ func TestKickstart(t *testing.T) { return } t.Log("success") + + if err := os.RemoveAll(clusterAsset.ClusterID); err != nil { + t.Logf("Failed to remove cluster folder: %v", err) + } }) t.Run("GenerateBootConfig_fail", func(t *testing.T) { diff --git a/pkg/osmanager/bootconfig/tools_test.go b/pkg/osmanager/bootconfig/tools_test.go index 8296fb2..f91f683 100644 --- a/pkg/osmanager/bootconfig/tools_test.go +++ b/pkg/osmanager/bootconfig/tools_test.go @@ -51,7 +51,7 @@ func TestTool(t *testing.T) { PersistDir: "/", BootstrapUrl: globalconfig.BootstrapUrl{ BootstrapIgnHost: "127.0.0.1", - BootstrapIgnPort: "9080", + BootstrapIgnPort: "1234", }, } diff --git a/pkg/osmanager/generalos/generalos_test.go b/pkg/osmanager/generalos/generalos_test.go index 14caef3..4ff2a7b 100644 --- a/pkg/osmanager/generalos/generalos_test.go +++ b/pkg/osmanager/generalos/generalos_test.go @@ -90,7 +90,7 @@ func TestGeneralos(t *testing.T) { PersistDir: "/", BootstrapUrl: globalconfig.BootstrapUrl{ BootstrapIgnHost: "127.0.0.1", - BootstrapIgnPort: "9080", + BootstrapIgnPort: "1234", }, } diff --git a/pkg/osmanager/nestos/nestos_test.go b/pkg/osmanager/nestos/nestos_test.go index 84b9e0f..25c687d 100644 --- a/pkg/osmanager/nestos/nestos_test.go +++ b/pkg/osmanager/nestos/nestos_test.go @@ -90,7 +90,7 @@ func TestNestOS(t *testing.T) { PersistDir: "/", BootstrapUrl: globalconfig.BootstrapUrl{ BootstrapIgnHost: "127.0.0.1", - BootstrapIgnPort: "9080", + BootstrapIgnPort: "1234", }, } diff --git a/pkg/osmanager/osmanager_test.go b/pkg/osmanager/osmanager_test.go index 32bd604..8879e56 100644 --- a/pkg/osmanager/osmanager_test.go +++ b/pkg/osmanager/osmanager_test.go @@ -90,7 +90,7 @@ func TestOsmanager(t *testing.T) { PersistDir: "/", BootstrapUrl: globalconfig.BootstrapUrl{ BootstrapIgnHost: "127.0.0.1", - BootstrapIgnPort: "9080", + BootstrapIgnPort: "1234", }, } diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go index d21de68..a273214 100644 --- a/pkg/utils/utils_test.go +++ b/pkg/utils/utils_test.go @@ -77,7 +77,7 @@ func TestGetLocalIP(t *testing.T) { } func TestIsPortOpen(t *testing.T) { - port := "8080" + port := "6789" if !IsPortOpen(port) { t.Errorf("expected port %s to be open", port) } -- Gitee