Skip to content

Commit

Permalink
chore: Refactor tests to utilize github.com/stretchr/testify (#509)
Browse files Browse the repository at this point in the history 
Signed-off-by: Tyler Auerbeck <tylerauerbeck@users.noreply.github.com>

Co-authored-by: Tyler Auerbeck <tylerauerbeck@users.noreply.github.com>
Co-authored-by: William Tam <wtam@redhat.com>
  • Loading branch information
@tylerauerbeck @wtam2018
3 people committed Jan 6, 2022
1 parent 536a1e8 commit bf8e5e0
Show file tree
Hide file tree
Showing 18 changed files with 378 additions and 324 deletions.
32 changes: 16 additions & 16 deletions controllers/argocd/applicationset_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"gotest.tools/assert"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
Expand All @@ -45,10 +45,10 @@ func TestReconcileApplicationSet_CreateDeployments(t *testing.T) {

sa := corev1.ServiceAccount{}

assert.NilError(t, r.reconcileApplicationSetDeployment(a, &sa))
assert.NoError(t, r.reconcileApplicationSetDeployment(a, &sa))

deployment := &appsv1.Deployment{}
assert.NilError(t, r.Client.Get(
assert.NoError(t, r.Client.Get(
context.TODO(),
types.NamespacedName{
Name: "argocd-applicationset-controller",
Expand Down Expand Up @@ -176,10 +176,10 @@ func TestReconcileApplicationSet_UpdateExistingDeployments(t *testing.T) {

sa := corev1.ServiceAccount{}

assert.NilError(t, r.reconcileApplicationSetDeployment(a, &sa))
assert.NoError(t, r.reconcileApplicationSetDeployment(a, &sa))

deployment := &appsv1.Deployment{}
assert.NilError(t, r.Client.Get(
assert.NoError(t, r.Client.Get(
context.TODO(),
types.NamespacedName{
Name: "argocd-applicationset-controller",
Expand All @@ -200,10 +200,10 @@ func TestReconcileApplicationSet_Deployments_resourceRequirements(t *testing.T)

sa := corev1.ServiceAccount{}

assert.NilError(t, r.reconcileApplicationSetDeployment(a, &sa))
assert.NoError(t, r.reconcileApplicationSetDeployment(a, &sa))

deployment := &appsv1.Deployment{}
assert.NilError(t, r.Client.Get(
assert.NoError(t, r.Client.Get(
context.TODO(),
types.NamespacedName{
Name: "argocd-applicationset-controller",
Expand Down Expand Up @@ -312,10 +312,10 @@ func TestReconcileApplicationSet_Deployments_SpecOverride(t *testing.T) {
a.Spec.ApplicationSet = test.appSetField

sa := corev1.ServiceAccount{}
assert.NilError(t, r.reconcileApplicationSetDeployment(a, &sa))
assert.NoError(t, r.reconcileApplicationSetDeployment(a, &sa))

deployment := &appsv1.Deployment{}
assert.NilError(t, r.Client.Get(
assert.NoError(t, r.Client.Get(
context.TODO(),
types.NamespacedName{
Name: "argocd-applicationset-controller",
Expand All @@ -337,10 +337,10 @@ func TestReconcileApplicationSet_ServiceAccount(t *testing.T) {
r := makeTestReconciler(t, a)

retSa, err := r.reconcileApplicationSetServiceAccount(a)
assert.NilError(t, err)
assert.NoError(t, err)

sa := &corev1.ServiceAccount{}
assert.NilError(t, r.Client.Get(
assert.NoError(t, r.Client.Get(
context.TODO(),
types.NamespacedName{
Name: "argocd-applicationset-controller",
Expand All @@ -359,10 +359,10 @@ func TestReconcileApplicationSet_Role(t *testing.T) {
r := makeTestReconciler(t, a)

roleRet, err := r.reconcileApplicationSetRole(a)
assert.NilError(t, err)
assert.NoError(t, err)

role := &rbacv1.Role{}
assert.NilError(t, r.Client.Get(
assert.NoError(t, r.Client.Get(
context.TODO(),
types.NamespacedName{
Name: "argocd-applicationset-controller",
Expand Down Expand Up @@ -396,7 +396,7 @@ func TestReconcileApplicationSet_Role(t *testing.T) {
sort.Strings(expectedResources)
sort.Strings(foundResources)

assert.DeepEqual(t, expectedResources, foundResources)
assert.Equal(t, expectedResources, foundResources)
}

func TestReconcileApplicationSet_RoleBinding(t *testing.T) {
Expand All @@ -408,10 +408,10 @@ func TestReconcileApplicationSet_RoleBinding(t *testing.T) {
sa := &corev1.ServiceAccount{ObjectMeta: metav1.ObjectMeta{Name: "sa-name"}}

err := r.reconcileApplicationSetRoleBinding(a, role, sa)
assert.NilError(t, err)
assert.NoError(t, err)

roleBinding := &rbacv1.RoleBinding{}
assert.NilError(t, r.Client.Get(
assert.NoError(t, r.Client.Get(
context.TODO(),
types.NamespacedName{
Name: "argocd-applicationset-controller",
Expand Down
16 changes: 8 additions & 8 deletions controllers/argocd/argocd_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"gotest.tools/assert"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/rbac/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand All @@ -50,7 +50,7 @@ func TestReconcileArgoCD_Reconcile_with_deleted(t *testing.T) {
a := makeTestArgoCD(deletedAt(time.Now()))

r := makeTestReconciler(t, a)
assert.NilError(t, createNamespace(r, a.Namespace, ""))
assert.NoError(t, createNamespace(r, a.Namespace, ""))

req := reconcile.Request{
NamespacedName: types.NamespacedName{
Expand All @@ -59,7 +59,7 @@ func TestReconcileArgoCD_Reconcile_with_deleted(t *testing.T) {
},
}
res, err := r.Reconcile(context.TODO(), req)
assert.NilError(t, err)
assert.NoError(t, err)
if res.Requeue {
t.Fatal("reconcile requeued request")
}
Expand All @@ -78,7 +78,7 @@ func TestReconcileArgoCD_Reconcile(t *testing.T) {
a := makeTestArgoCD()

r := makeTestReconciler(t, a)
assert.NilError(t, createNamespace(r, a.Namespace, ""))
assert.NoError(t, createNamespace(r, a.Namespace, ""))

req := reconcile.Request{
NamespacedName: types.NamespacedName{
Expand All @@ -88,7 +88,7 @@ func TestReconcileArgoCD_Reconcile(t *testing.T) {
}

res, err := r.Reconcile(context.TODO(), req)
assert.NilError(t, err)
assert.NoError(t, err)
if res.Requeue {
t.Fatal("reconcile requeued request")
}
Expand Down Expand Up @@ -116,7 +116,7 @@ func TestReconcileArgoCD_CleanUp(t *testing.T) {
resources := []runtime.Object{a}
resources = append(resources, clusterResources(a)...)
r := makeTestReconciler(t, resources...)
assert.NilError(t, createNamespace(r, a.Namespace, ""))
assert.NoError(t, createNamespace(r, a.Namespace, ""))

req := reconcile.Request{
NamespacedName: types.NamespacedName{
Expand All @@ -125,7 +125,7 @@ func TestReconcileArgoCD_CleanUp(t *testing.T) {
},
}
res, err := r.Reconcile(context.TODO(), req)
assert.NilError(t, err)
assert.NoError(t, err)
if res.Requeue {
t.Fatal("reconcile requeued request")
}
Expand Down Expand Up @@ -163,7 +163,7 @@ func TestReconcileArgoCD_CleanUp(t *testing.T) {

// check if namespace label was removed
ns := &corev1.Namespace{}
assert.NilError(t, r.Client.Get(context.TODO(), types.NamespacedName{Name: a.Namespace}, ns))
assert.NoError(t, r.Client.Get(context.TODO(), types.NamespacedName{Name: a.Namespace}, ns))
if _, ok := ns.Labels[common.ArgoCDManagedByLabel]; ok {
t.Errorf("Expected the label[%v] to be removed from the namespace[%v]", common.ArgoCDManagedByLabel, a.Namespace)
}
Expand Down

0 comments on commit bf8e5e0

Please sign in to comment.