From be7c223043479749626248024c8c2d8dd039741e Mon Sep 17 00:00:00 2001 From: Tamer Tas Date: Sat, 1 Aug 2015 22:01:51 +0300 Subject: [PATCH 1/2] Refactor probe.Result enumeration --- pkg/probe/probe.go | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkg/probe/probe.go b/pkg/probe/probe.go index 790bdbcf724..f175860d7a1 100644 --- a/pkg/probe/probe.go +++ b/pkg/probe/probe.go @@ -16,22 +16,10 @@ limitations under the License. package probe -type Result int +type Result string -// Status values must be one of these constants. const ( - Success Result = iota - Failure - Unknown + Success Result = "success" + Failure Result = "failure" + Unknown Result = "unknown" ) - -func (s Result) String() string { - switch s { - case Success: - return "success" - case Failure: - return "failure" - default: - return "unknown" - } -} From 16b4428043d45422c62e64da15dfbccac1c93cfc Mon Sep 17 00:00:00 2001 From: Tamer Tas Date: Mon, 10 Aug 2015 20:44:36 +0300 Subject: [PATCH 2/2] Fix usage of format specifier %s --- pkg/apiserver/validator_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/apiserver/validator_test.go b/pkg/apiserver/validator_test.go index 5dcd2681624..9f3420a5d7f 100644 --- a/pkg/apiserver/validator_test.go +++ b/pkg/apiserver/validator_test.go @@ -89,7 +89,7 @@ func TestValidate(t *testing.T) { t.Errorf("expected empty string, got %s", status) } if status != test.expectedStatus { - t.Errorf("expected %s, got %s", test.expectedStatus.String(), status.String()) + t.Errorf("expected %s, got %s", test.expectedStatus, status) } } }