Skip to content

Commit

Permalink
Fix nits for test suites in pkg/component (#8007)
Browse files Browse the repository at this point in the history
* Add missing suites and fix failing tests

(now that are executed as part of `make test`)

* Streamline test suite names in `component` package
  • Loading branch information
rfranzke committed Jun 1, 2023
1 parent 5eea9f2 commit a377725
Show file tree
Hide file tree
Showing 71 changed files with 193 additions and 136 deletions.
2 changes: 1 addition & 1 deletion pkg/component/apiserverproxy/apiserver_proxy_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestAPIServerProxy(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component APIServerProxy Suite")
RunSpecs(t, "Component APIServerProxy Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/backupentry/backupentry_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ import (
func TestBackupEntry(t *testing.T) {
features.RegisterFeatureGates()
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component BackupEntry Suite")
RunSpecs(t, "Component BackupEntry Suite")
}
4 changes: 2 additions & 2 deletions pkg/component/blackboxexporter/blackboxexporter_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
. "github.com/onsi/gomega"
)

func TestSeedSystem(t *testing.T) {
func TestBlackboxExporter(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component BlackboxExporter Suite")
RunSpecs(t, "Component BlackboxExporter Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestClusterAutoscaler(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component ClusterAutoscaler Suite")
RunSpecs(t, "Component ClusterAutoscaler Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestClusterIdentity(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component ClusterIdentity Suite")
RunSpecs(t, "Component ClusterIdentity Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/component_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestComponent(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Suite")
RunSpecs(t, "Component Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/coredns/coredns_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestCoreDNS(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component CoreDNS Suite")
RunSpecs(t, "Component CoreDNS Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestDependencyWatchdog(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component DependencyWatchdog Suite")
RunSpecs(t, "Component DependencyWatchdog Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/etcd/etcd_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
func TestEtcd(t *testing.T) {
gardenletfeatures.RegisterFeatureGates()
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Etcd Suite")
RunSpecs(t, "Component Etcd Suite")
}

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestEtcdCopyBackupsTask(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component EtcdCopyBackupsTask Suite")
RunSpecs(t, "Component EtcdCopyBackupsTask Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestBackupEntry(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions BackupEntry Suite")
RunSpecs(t, "Component Extensions BackupEntry Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestContainerRuntime(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions ContainerRuntime Suite")
RunSpecs(t, "Component Extensions ContainerRuntime Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestControlPlane(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions ControlPlane Suite")
RunSpecs(t, "Component Extensions ControlPlane Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/extensions/crds/crds_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestExtensionCRDs(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions CRDs Suite")
RunSpecs(t, "Component Extensions CRDs Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/extensions/dnsrecord/dnsrecord_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestDNSRecord(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions DNSRecord Suite")
RunSpecs(t, "Component Extensions DNSRecord Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/extensions/extension/extension_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestExtension(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions Extension Suite")
RunSpecs(t, "Component Extensions Extension Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestInfrastructure(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions Infrastructure Suite")
RunSpecs(t, "Component Extensions Infrastructure Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/extensions/network/network_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestNetwork(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions Network Suite")
RunSpecs(t, "Component Extensions Network Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestDownloader(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Downloader Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Downloader Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestExecutor(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Executor Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Executor Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestOperatingSystemConfig(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestContainerD(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components ContainerD Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components ContainerD Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestLogrotate(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components Containerd Logrotate Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components Containerd Logrotate Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestDocker(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components Docker Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components Docker Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestLogrotate(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components Docker Logrotate Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components Docker Logrotate Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestGardenerUser(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components GardenerUser Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components GardenerUser Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestJournalD(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components JournalD Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components JournalD Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestKernelConfig(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components KernelConfig Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components KernelConfig Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestKubelet(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components Kubelet Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components Kubelet Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestRootCertificates(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components RootCertificates Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components RootCertificates Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestSSHDEnsurer(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components SSHDEnsurer Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components SSHDEnsurer Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestValitail(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components Valitail Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components Valitail Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestVarLibMount(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Components VarLibMount Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Components VarLibMount Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestOriginal(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Original Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Original Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestUtils(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions OperatingSystemConfig Utils Suite")
RunSpecs(t, "Component Extensions OperatingSystemConfig Utils Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/extensions/worker/worker_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestWorker(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Extensions Worker Suite")
RunSpecs(t, "Component Extensions Worker Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/gardeneraccess/gardeneraccess_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestGardenerAccess(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component GardenerAccess Suite")
RunSpecs(t, "Component GardenerAccess Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/gardensystem/gardensystem_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestGardenSystem(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component GardenSystem Suite")
RunSpecs(t, "Component GardenSystem Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/hvpa/hvpa_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestHVPA(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component HVPA Suite")
RunSpecs(t, "Component HVPA Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/istio/istio_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestIstio(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Istio Suite")
RunSpecs(t, "Component Istio Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/kubeapiserver/kube_apiserver_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestKubeAPIServer(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component KubeAPIServer Suite")
RunSpecs(t, "Component KubeAPIServer Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestControlPlane(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component KubeAPIServerExposure Suite")
RunSpecs(t, "Component KubeAPIServerExposure Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

func TestKubeControllerManager(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component KubeControllerManager Suite")
RunSpecs(t, "Component KubeControllerManager Suite")
}

var _ = BeforeSuite(func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/component/kubeproxy/kube_proxy_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestKubeProxy(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component KubeProxy Suite")
RunSpecs(t, "Component KubeProxy Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestKubernetesDashboard(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component KubernetesDashboard Suite")
RunSpecs(t, "Component KubernetesDashboard Suite")
}
2 changes: 1 addition & 1 deletion pkg/component/kubescheduler/kube_scheduler_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

func TestKubeScheduler(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component KubeScheduler Suite")
RunSpecs(t, "Component KubeScheduler Suite")
}

var _ = BeforeSuite(func() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestKubeStateMetrics(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component KubeStateMetrics Suite")
RunSpecs(t, "Component KubeStateMetrics Suite")
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ import (

func TestEventLogger(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Botanist Component Logging EventLogger Suite")
RunSpecs(t, "Component Logging EventLogger Suite")
}

0 comments on commit a377725

Please sign in to comment.