X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7ba6bdf406546ec225baea49dbe6ccbf02e70f53..0eb72b526bf8bbb011551ecf019f604e17a534f1:/services/keep-balance/balance_run_test.go

diff --git a/services/keep-balance/balance_run_test.go b/services/keep-balance/balance_run_test.go
index 23d74fe119..2d6dd2b5a6 100644
--- a/services/keep-balance/balance_run_test.go
+++ b/services/keep-balance/balance_run_test.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -138,7 +142,9 @@ func (s *stubServer) serveCollectionsButSkipOne() *reqTracker {
 		rt.Add(r)
 		if strings.Contains(r.Form.Get("filters"), `"modified_at","\u003c="`) {
 			io.WriteString(w, `{"items_available":3,"items":[]}`)
-		} else if strings.Contains(r.Form.Get("filters"), `"modified_at","\u003e="`) {
+		} else if strings.Contains(r.Form.Get("filters"), `"modified_at","\u003e`) {
+			io.WriteString(w, `{"items_available":0,"items":[]}`)
+		} else if strings.Contains(r.Form.Get("filters"), `"modified_at","="`) && strings.Contains(r.Form.Get("filters"), `"uuid","\u003e"`) {
 			io.WriteString(w, `{"items_available":0,"items":[]}`)
 		} else {
 			io.WriteString(w, `{"items_available":2,"items":[
@@ -302,7 +308,7 @@ func (s *runSuite) TestDryRun(c *check.C) {
 		Logger:      s.logger(c),
 	}
 	s.stub.serveCurrentUserAdmin()
-	s.stub.serveFooBarFileCollections()
+	collReqs := s.stub.serveFooBarFileCollections()
 	s.stub.serveFourDiskKeepServices()
 	s.stub.serveKeepstoreIndexFoo4Bar1()
 	trashReqs := s.stub.serveKeepstoreTrash()
@@ -310,6 +316,9 @@ func (s *runSuite) TestDryRun(c *check.C) {
 	var bal Balancer
 	_, err := bal.Run(s.config, opts)
 	c.Check(err, check.IsNil)
+	for _, req := range collReqs.reqs {
+		c.Check(req.Form.Get("include_trash"), check.Equals, "true")
+	}
 	c.Check(trashReqs.Count(), check.Equals, 0)
 	c.Check(pullReqs.Count(), check.Equals, 0)
 	stats := bal.getStatistics()