Merge pull request #4458 from xiang90/cl

etcd-tester: cleanup

tools/functional-tester/etcd-tester/tester.go

@@ -244,28 +244,6 @@ func (c *cluster) getKVHash() (map[string]int64, error) {
 	return hashes, nil
 }
 
-func getSameValue(hashes map[string]int64) (int64, bool) {
-	var rv int64
-	ok := true
-	for _, v := range hashes {
-		if rv == 0 {
-			rv = v
-		}
-		if rv != v {
-			ok = false
-			break
-		}
-	}
-	return rv, ok
-}
-
-func max(n1, n2 int64) int64 {
-	if n1 > n2 {
-		return n1
-	}
-	return n2
-}
-
 func (c *cluster) compactKV(rev int64) error {
 	var (
 		conn *grpc.ClientConn

tools/functional-tester/etcd-tester/util.go

@@ -0,0 +1,35 @@
+// Copyright 2016 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+func getSameValue(vals map[string]int64) (int64, bool) {
+	var rv int64
+	for _, v := range vals {
+		if rv == 0 {
+			rv = v
+		}
+		if rv != v {
+			return -1, false
+		}
+	}
+	return rv, true
+}
+
+func max(n1, n2 int64) int64 {
+	if n1 > n2 {
+		return n1
+	}
+	return n2
+}