fix: failing tests

argoproj-labs · Jan 25, 2024 · edbd59c · edbd59c
1 parent c740719
commit edbd59c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/controllers/argocd/notifications_test.go b/controllers/argocd/notifications_test.go
@@ -317,7 +317,8 @@ func TestReconcileNotifications_CreateServiceMonitor(t *testing.T) {
 	assert.Equal(t, testServiceMonitor.ObjectMeta.Labels["release"], "prometheus-operator")
 
 	assert.Equal(t, testServiceMonitor.Spec.Endpoints[0].Port, "notification")
-	assert.Equal(t, testServiceMonitor.Spec.Endpoints[0].Scheme, "30s")
+	assert.Equal(t, testServiceMonitor.Spec.Endpoints[0].Scheme, "http")
+	assert.Equal(t, testServiceMonitor.Spec.Endpoints[0].Interval, "30s")
 	assert.Equal(t, testServiceMonitor.Spec.Selector.MatchLabels["app.kubernetes.io/name"],
 		fmt.Sprintf("%s-%s", a.Name, "notifications-controller"))
 }

diff --git a/tests/k8s/1-027_validate_applicationset_status/03-change-appset-image.yaml b/tests/k8s/1-027_validate_applicationset_status/03-change-appset-image.yaml
@@ -4,8 +4,4 @@ metadata:
   name: example-argocd
 spec:
   applicationSet:
-<<<<<<< HEAD
     image: quay.io/argoproj/argocd@sha256:8576d347f30fa4c56a0129d1c0a0f5ed1e75662f0499f1ed7e917c405fd909dc
-=======
-    image: quay.io/argoproj/argocd@sha256:829643e07dd938a97bef2496131d11598c9385a06030579365a6b313f9b878cf
->>>>>>> 0455df9 (feat: upgrade Argo CD for release v.9.0)