Fix e2e tests failure

etcd-io · Oct 18, 2019 · 8a0b902 · 8a0b902
1 parent db9f5b0
commit 8a0b902
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/e2e/etcd_release_upgrade_test.go b/e2e/etcd_release_upgrade_test.go
@@ -103,7 +103,7 @@ func TestReleaseUpgrade(t *testing.T) {
 	}
 
 	// expect upgraded cluster version
-	if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: fmt.Sprintf(`etcd_cluster_version{cluster_version="%s"} 1`, version.Cluster(version.Version)), metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil {
+	if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: fmt.Sprintf(`etcd_cluster_version{cluster_version="%s"} 1`, version.Cluster(version.Version))}); err != nil {
 		cx.t.Fatalf("failed get with curl (%v)", err)
 	}
 }

diff --git a/tests/e2e/metrics_test.go → e2e/metrics_test.go b/tests/e2e/metrics_test.go → e2e/metrics_test.go
@@ -22,38 +22,30 @@ import (
 	"github.com/coreos/etcd/version"
 )
 
-func TestV3MetricsSecure(t *testing.T) {
+func TestV3Metrics(t *testing.T) {
 	cfg := configTLS
 	cfg.clusterSize = 1
-	cfg.metricsURLScheme = "https"
-	testCtl(t, metricsTest)
-}
-
-func TestV3MetricsInsecure(t *testing.T) {
-	cfg := configTLS
-	cfg.clusterSize = 1
-	cfg.metricsURLScheme = "http"
 	testCtl(t, metricsTest)
 }
 
 func metricsTest(cx ctlCtx) {
 	if err := ctlV3Put(cx, "k", "v", ""); err != nil {
 		cx.t.Fatal(err)
 	}
-	if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: `etcd_debugging_mvcc_keys_total 1`, metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil {
+	if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: `etcd_debugging_mvcc_keys_total 1`}); err != nil {
 		cx.t.Fatalf("failed get with curl (%v)", err)
 	}
-	if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: fmt.Sprintf(`etcd_server_version{server_version="%s"} 1`, version.Version), metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil {
+	if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: fmt.Sprintf(`etcd_server_version{server_version="%s"} 1`, version.Version)}); err != nil {
 		cx.t.Fatalf("failed get with curl (%v)", err)
 	}
 	ver := version.Version
 	if strings.HasSuffix(ver, "+git") {
 		ver = strings.Replace(ver, "+git", "", 1)
 	}
-	if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: fmt.Sprintf(`etcd_cluster_version{cluster_version="%s"} 1`, version.Cluster(version.Version)), metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil {
+	if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: fmt.Sprintf(`etcd_cluster_version{cluster_version="%s"} 1`, version.Cluster(version.Version))}); err != nil {
 		cx.t.Fatalf("failed get with curl (%v)", err)
 	}
-	if err := cURLGet(cx.epc, cURLReq{endpoint: "/health", expected: `{"health":"true"}`, metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil {
+	if err := cURLGet(cx.epc, cURLReq{endpoint: "/health", expected: `{"health": "true"}`}); err != nil {
 		cx.t.Fatalf("failed get with curl (%v)", err)
 	}
 }