From d7b4fa8d784088d2f5972fef7a9d25cb8e1af847 Mon Sep 17 00:00:00 2001 From: Julien Levesy Date: Thu, 12 Oct 2017 13:16:54 +0200 Subject: [PATCH] use testutil assertions in the cmd/prometheus package --- cmd/prometheus/main_test.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cmd/prometheus/main_test.go b/cmd/prometheus/main_test.go index 8921827c7..e327b9014 100644 --- a/cmd/prometheus/main_test.go +++ b/cmd/prometheus/main_test.go @@ -13,7 +13,11 @@ package main -import "testing" +import ( + "testing" + + "github.com/prometheus/prometheus/util/testutil" +) func TestComputeExternalURL(t *testing.T) { tests := []struct { @@ -54,13 +58,12 @@ func TestComputeExternalURL(t *testing.T) { }, } - for i, test := range tests { - r, err := computeExternalURL(test.input, "0.0.0.0:9090") - if test.valid && err != nil { - t.Errorf("%d. expected input to be valid, got %s", i, err) - } else if !test.valid && err == nil { - t.Logf("%+v", test, r) - t.Errorf("%d. expected input to be invalid", i) + for _, test := range tests { + _, err := computeExternalURL(test.input, "0.0.0.0:9090") + if test.valid { + testutil.Ok(t, err) + } else { + testutil.NotOk(t, err) } } }