Format.String() returns human-readable values.

pkg/stats/e2e_test.go

@@ -57,11 +57,11 @@ var (
 		S7sUnknown: {'?', "unknown"},
 	}
 	formats = map[Format]expRuneStr{
-		Integer:       {'i', "i"},
-		Bytes:         {'B', "B"},
-		FormatBitmap:  {'b', "b"},
-		Duration:      {'d', "d"},
-		FormatUnknown: {'?', "?"},
+		Integer:       {'i', "integer"},
+		Bytes:         {'B', "bytes"},
+		FormatBitmap:  {'b', "bitmap"},
+		Duration:      {'d', "duration"},
+		FormatUnknown: {'?', "unknown"},
 	}
 )
 

pkg/stats/stats.go

@@ -114,9 +114,23 @@ const (
 	FormatUnknown = Format('?')
 )
 
-// String returns "i", "B", "b", "d" or "?".
-func (s Format) String() string {
-	return string(s)
+// String returns "integer", "bytes", "bitmap", "duration" or
+// "unknown".
+func (f Format) String() string {
+	switch (f) {
+	case Integer:
+		return "integer"
+	case Bytes:
+		return "bytes"
+	case FormatBitmap:
+		return "bitmap"
+	case Duration:
+		return "duration"
+	case FormatUnknown:
+		return "unknown"
+	default:
+		return "invalid status"
+	}
 }
 
 // XXX implement fmt.Formatter interface for Format