From b842cf7770118c936a1650150e400cbc1ef81db1 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 2 Aug 2019 15:57:45 -0700 Subject: [PATCH] tests/e2e: fix upgrade, metrics tests Signed-off-by: Gyuho Lee --- tests/e2e/etcd_release_upgrade_test.go | 4 ++-- tests/e2e/metrics_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/e2e/etcd_release_upgrade_test.go b/tests/e2e/etcd_release_upgrade_test.go index 0ebdbf1e1..685e36337 100644 --- a/tests/e2e/etcd_release_upgrade_test.go +++ b/tests/e2e/etcd_release_upgrade_test.go @@ -105,8 +105,8 @@ func TestReleaseUpgrade(t *testing.T) { // expect upgraded cluster version ver := version.Version - if strings.HasSuffix(ver, "+git") { - ver = strings.Replace(ver, "+git", "", 1) + if strings.HasSuffix(ver, "-pre") { + ver = strings.Replace(ver, "-pre", "", 1) } if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: fmt.Sprintf(`etcd_cluster_version{cluster_version="%s"} 1`, ver), metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil { cx.t.Fatalf("failed get with curl (%v)", err) diff --git a/tests/e2e/metrics_test.go b/tests/e2e/metrics_test.go index ce2bc516c..5cbd4fe2c 100644 --- a/tests/e2e/metrics_test.go +++ b/tests/e2e/metrics_test.go @@ -41,8 +41,8 @@ func metricsTest(cx ctlCtx) { cx.t.Fatal(err) } ver := version.Version - if strings.HasSuffix(ver, "+git") { - ver = strings.Replace(ver, "+git", "", 1) + if strings.HasSuffix(ver, "-pre") { + ver = strings.Replace(ver, "-pre", "", 1) } i := 0