X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e61de9add861db4c043341f3926acb95ded37862..46f0c0faf4f032697d59c2d663018ae67d1059d4:/sdk/go/keepclient/root_sorter_test.go

diff --git a/sdk/go/keepclient/root_sorter_test.go b/sdk/go/keepclient/root_sorter_test.go
index 7fe6a70fa8..a6fbaeded3 100644
--- a/sdk/go/keepclient/root_sorter_test.go
+++ b/sdk/go/keepclient/root_sorter_test.go
@@ -1,7 +1,10 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package keepclient
 
 import (
-	"crypto/md5"
 	"fmt"
 	. "gopkg.in/check.v1"
 	"strconv"
@@ -9,28 +12,25 @@ import (
 )
 
 type RootSorterSuite struct{}
+
 var _ = Suite(&RootSorterSuite{})
 
-func FakeSvcRoot(i uint64) (string) {
+func FakeSvcRoot(i uint64) string {
 	return fmt.Sprintf("https://%x.svc/", i)
 }
 
-func FakeSvcUuid(i uint64) (string) {
+func FakeSvcUUID(i uint64) string {
 	return fmt.Sprintf("zzzzz-bi6l4-%015x", i)
 }
 
-func FakeServiceRoots(n uint64) (map[string]string) {
+func FakeServiceRoots(n uint64) map[string]string {
 	sr := map[string]string{}
-	for i := uint64(0); i < n; i ++ {
-		sr[FakeSvcUuid(i)] = FakeSvcRoot(i)
+	for i := uint64(0); i < n; i++ {
+		sr[FakeSvcUUID(i)] = FakeSvcRoot(i)
 	}
 	return sr
 }
 
-func Md5String(data string) (string) {
-	return fmt.Sprintf("%032x", md5.Sum([]byte(data)))
-}
-
 func (*RootSorterSuite) EmptyRoots(c *C) {
 	rs := NewRootSorter(map[string]string{}, Md5String("foo"))
 	c.Check(rs.GetSortedRoots(), Equals, []string{})
@@ -44,20 +44,20 @@ func (*RootSorterSuite) JustOneRoot(c *C) {
 func (*RootSorterSuite) ReferenceSet(c *C) {
 	fakeroots := FakeServiceRoots(16)
 	// These reference probe orders are explained further in
-	// ../../python/arvados/keep.py:
-	expected_orders := []string{
+	// ../../python/tests/test_keep_client.py:
+	expectedOrders := []string{
 		"3eab2d5fc9681074",
 		"097dba52e648f1c3",
 		"c5b4e023f8a7d691",
 		"9d81c02e76a3bf54",
 	}
-	for h, expected_order := range expected_orders {
+	for h, expectedOrder := range expectedOrders {
 		hash := Md5String(fmt.Sprintf("%064x", h))
 		roots := NewRootSorter(fakeroots, hash).GetSortedRoots()
-		for i, svc_id_s := range strings.Split(expected_order, "") {
-			svc_id, err := strconv.ParseUint(svc_id_s, 16, 64)
+		for i, svcIDs := range strings.Split(expectedOrder, "") {
+			svcID, err := strconv.ParseUint(svcIDs, 16, 64)
 			c.Assert(err, Equals, nil)
-			c.Check(roots[i], Equals, FakeSvcRoot(svc_id))
+			c.Check(roots[i], Equals, FakeSvcRoot(svcID))
 		}
 	}
 }