test: refactor use require assert

Author: lukasmetzner

tests/e2e/cloud_test.go

@@ -27,7 +27,7 @@ func TestNodeSetCorrectNodeLabelsAndIPAddresses(t *testing.T) {
 	t.Parallel()
 
 	node, err := testCluster.k8sClient.CoreV1().Nodes().Get(t.Context(), testCluster.ControlNodeName(), metav1.GetOptions{})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	server, _, err := testCluster.hcloud.Server.Get(t.Context(), testCluster.ControlNodeName())
 	if err != nil {

tests/e2e/e2e_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -34,7 +35,7 @@ func TestPodIsPresent(t *testing.T) {
 
 	t.Run("hcloud-cloud-controller-manager pod is present in kube-system", func(t *testing.T) {
 		pods, err := testCluster.k8sClient.CoreV1().Pods("kube-system").List(t.Context(), metav1.ListOptions{})
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
 		found := false
 		for _, pod := range pods.Items {
@@ -43,20 +44,16 @@ func TestPodIsPresent(t *testing.T) {
 				break
 			}
 		}
-		if !found {
-			t.Error("kube-system does not contain a pod named hcloud-cloud-controller-manager")
-		}
+		assert.True(t, found, "kube-system does not contain a pod named hcloud-cloud-controller-manager")
 	})
 
 	t.Run("pod with app=hcloud-cloud-controller-manager is present in kube-system", func(t *testing.T) {
 		pods, err := testCluster.k8sClient.CoreV1().Pods("kube-system").
 			List(t.Context(), metav1.ListOptions{
 				LabelSelector: "app.kubernetes.io/name=hcloud-cloud-controller-manager",
 			})
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
-		if len(pods.Items) == 0 {
-			t.Fatal("kube-system does not contain a pod with label app=hcloud-cloud-controller-manager")
-		}
+		require.NotEmpty(t, pods.Items, "kube-system does not contain a pod with label app=hcloud-cloud-controller-manager")
 	})
 }

tests/e2e/helper_test.go

@@ -14,6 +14,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
 	hrobot "github.com/syself/hrobot-go"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -312,16 +313,20 @@ func (l *lbTestHelper) CreateService(lbSvc *corev1.Service) (*corev1.Service, er
 func (l *lbTestHelper) TearDown() {
 	l.t.Helper()
 
+	// No namespace was created yet (e.g. DeployTestPod never ran because a
+	// prior step failed); nothing to clean up.
+	if l.namespace == "" {
+		return
+	}
+
 	err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 3*time.Minute, true, func(ctx context.Context) (bool, error) {
 		err := testCluster.k8sClient.CoreV1().Namespaces().Delete(ctx, l.namespace, metav1.DeleteOptions{})
 		if err != nil && !k8serrors.IsNotFound(err) {
 			return false, err
 		}
 		return k8serrors.IsNotFound(err), nil
 	})
-	if err != nil {
-		l.t.Fatal(err)
-	}
+	require.NoError(l.t, err)
 }
 
 // WaitForHTTPAvailable tries to connect to the given IP via HTTP or HTTPS

tests/e2e/robot_test.go

@@ -25,18 +25,18 @@ func TestNodeSetCorrectNodeLabelsAndIPAddressesRobot(t *testing.T) {
 	nodes, err := testCluster.k8sClient.CoreV1().Nodes().List(t.Context(), metav1.ListOptions{
 		LabelSelector: "instance.hetzner.cloud/is-root-server=true",
 	})
-	assert.NoError(t, err)
-	assert.GreaterOrEqual(t, len(nodes.Items), 1)
+	require.NoError(t, err)
+	require.GreaterOrEqual(t, len(nodes.Items), 1)
 	node := nodes.Items[0]
 
 	// Parse the server number from the ProviderID
 	id, isCloudServer, err := providerid.ToServerID(node.Spec.ProviderID)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.False(t, isCloudServer)
 
 	// Get the server from the Robot API to cross-check Labels
 	server, err := testCluster.hrobot.ServerGet(int(id))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	labels := node.Labels
 	expectedLabels := map[string]string{