store: separate tests that need Store from those needing *store

WayneCao · Aug 31, 2017 · cab7572 · cab7572
1 parent 8091be6
commit cab7572
Show file tree

Hide file tree

Showing 4 changed files with 606 additions and 473 deletions.
diff --git a/store/metrics.go b/store/metrics.go
@@ -86,7 +86,11 @@ const (
 )
 
 func init() {
-	prometheus.MustRegister(readCounter)
+	if prometheus.Register(readCounter) != nil {
+		// Tests will try to double register sicne the tests use both
+		// store and store_test packages; ignore second attempts.
+		return
+	}
 	prometheus.MustRegister(writeCounter)
 	prometheus.MustRegister(expireCounter)
 	prometheus.MustRegister(watchRequests)