Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/e2e: fix upgrade, metrics tests

Browse Source 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
This commit is contained in:
Gyuho Lee 2019-08-02 15:57:45 -07:00
parent df1d3f7c6e
commit bc9a54beae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/e2e/etcd_release_upgrade_test.go
View File

@ -105,8 +105,8 @@ func TestReleaseUpgrade(t *testing.T) {
// expect upgraded cluster version // expect upgraded cluster version
ver := version.Version ver := version.Version
if strings.HasSuffix(ver, "+git") { if strings.HasSuffix(ver, "-pre") {
ver = strings.Replace(ver, "+git", "", 1) 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 { 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) cx.t.Fatalf("failed get with curl (%v)", err)

4
tests/e2e/metrics_test.go
View File

@ -41,8 +41,8 @@ func metricsTest(cx ctlCtx) {
cx.t.Fatal(err) cx.t.Fatal(err)
} }
ver := version.Version ver := version.Version
if strings.HasSuffix(ver, "+git") { if strings.HasSuffix(ver, "-pre") {
ver = strings.Replace(ver, "+git", "", 1) ver = strings.Replace(ver, "-pre", "", 1)
} }
i := 0 i := 0