Merge branch '15928-fs-deadlock'

[arvados.git] / services / keep-balance / collection_test.go

diff --git a/services/keep-balance/collection_test.go b/services/keep-balance/collection_test.go
index 629ff3a140a6872e9edde9c6d1815fc6f2b9090b..f8921c294afa075f290c2db6fd352b315d25e8ac 100644 (file)
--- a/services/keep-balance/collection_test.go
+++ b/services/keep-balance/collection_test.go
@@ -1,10 +1,14 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
        "sync"
        "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
        check "gopkg.in/check.v1"
 )
 
@@ -25,24 +29,24 @@ func (s *integrationSuite) TestIdenticalTimestamps(c *check.C) {
                        longestStreak := 0
                        var lastMod time.Time
                        sawUUID := make(map[string]bool)
-                       err := EachCollection(&s.config.Client, pageSize, func(c arvados.Collection) error {
-                               got[trial] = append(got[trial], c.UUID)
-                               if c.ModifiedAt == nil {
+                       err := EachCollection(s.client, pageSize, func(c arvados.Collection) error {
+                               if c.ModifiedAt.IsZero() {
                                        return nil
                                }
                                if sawUUID[c.UUID] {
                                        // dup
                                        return nil
                                }
+                               got[trial] = append(got[trial], c.UUID)
                                sawUUID[c.UUID] = true
-                               if lastMod == *c.ModifiedAt {
+                               if lastMod == c.ModifiedAt {
                                        streak++
                                        if streak > longestStreak {
                                                longestStreak = streak
                                        }
                                } else {
                                        streak = 0
-                                       lastMod = *c.ModifiedAt
+                                       lastMod = c.ModifiedAt
                                }
                                return nil
                        }, nil)