[ARVADOS] updated: 2.1.0-307-gae3d77edc

[Git user]

Summary of changes:
 lib/crunchrun/crunchrun.go                      | 33 ++++++++++++++++---------
 tools/keep-block-check/keep-block-check.go      |  2 +-
 tools/keep-block-check/keep-block-check_test.go | 10 ++++----
 3 files changed, 27 insertions(+), 18 deletions(-)

       via  ae3d77edc33d0c9e11af1a59478feaf7251d8ca1 (commit)
       via  3e7ab60f94a6076383bf4aec41b6271310ab8823 (commit)
       via  8646fae34fff9aa379a34388e90106f31d5206a4 (commit)
       via  3d1a90b959e3035de4f3be1c511a721291507b5f (commit)
       via  3cb8be1e32a1b2e477501c38cefa4c48bbbb8c29 (commit)
      from  c81ce0ff89ad019d982bdccb376a823894eea733 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ae3d77edc33d0c9e11af1a59478feaf7251d8ca1
Merge: c81ce0ff8 3e7ab60f9
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Feb 1 09:07:37 2021 -0500

    17245: Merge branch 'master' into 17245-slurm-install-docs
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>


commit 3e7ab60f94a6076383bf4aec41b6271310ab8823
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Feb 1 09:06:28 2021 -0500

    Fix tests after yesterday's golint warning fix.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/tools/keep-block-check/keep-block-check_test.go b/tools/keep-block-check/keep-block-check_test.go
index f7d0fb9b9..9f409e6af 100644
--- a/tools/keep-block-check/keep-block-check_test.go
+++ b/tools/keep-block-check/keep-block-check_test.go
@@ -194,7 +194,7 @@ func (s *ServerRequiredSuite) TestBlockCheck_NoSuchBlock(c *C) {
 	allLocators = append(allLocators, TestHash2)
 	err := performKeepBlockCheck(kc, blobSignatureTTL, "", allLocators, true)
 	c.Check(err, NotNil)
-	c.Assert(err.Error(), Equals, "Block verification failed for 2 out of 7 blocks with matching prefix.")
+	c.Assert(err.Error(), Equals, "Block verification failed for 2 out of 7 blocks with matching prefix")
 	checkErrorLog(c, []string{TestHash, TestHash2}, "Error verifying block", "Block not found")
 }
 
@@ -210,7 +210,7 @@ func (s *ServerRequiredSuite) TestBlockCheck_NoSuchBlock_WithMatchingPrefix(c *C
 	err = performKeepBlockCheck(kc, blobSignatureTTL, "", locators, true)
 	c.Check(err, NotNil)
 	// Of the 7 blocks in allLocators, only two match the prefix and hence only those are checked
-	c.Assert(err.Error(), Equals, "Block verification failed for 2 out of 2 blocks with matching prefix.")
+	c.Assert(err.Error(), Equals, "Block verification failed for 2 out of 2 blocks with matching prefix")
 	checkErrorLog(c, []string{TestHash, TestHash2}, "Error verifying block", "Block not found")
 }
 
@@ -231,7 +231,7 @@ func (s *ServerRequiredSuite) TestBlockCheck_BadSignature(c *C) {
 	setupKeepBlockCheck(c, true, "")
 	setupTestData(c)
 	err := performKeepBlockCheck(kc, blobSignatureTTL, "badblobsigningkey", []string{TestHash, TestHash2}, false)
-	c.Assert(err.Error(), Equals, "Block verification failed for 2 out of 2 blocks with matching prefix.")
+	c.Assert(err.Error(), Equals, "Block verification failed for 2 out of 2 blocks with matching prefix")
 	checkErrorLog(c, []string{TestHash, TestHash2}, "Error verifying block", "HTTP 403")
 	// verbose logging not requested
 	c.Assert(strings.Contains(logBuffer.String(), "Verifying block 1 of 2"), Equals, false)
@@ -267,7 +267,7 @@ var testKeepServicesJSON = `{
 func (s *ServerRequiredSuite) TestErrorDuringKeepBlockCheck_FakeKeepservers(c *C) {
 	setupKeepBlockCheck(c, false, testKeepServicesJSON)
 	err := performKeepBlockCheck(kc, blobSignatureTTL, "", []string{TestHash, TestHash2}, true)
-	c.Assert(err.Error(), Equals, "Block verification failed for 2 out of 2 blocks with matching prefix.")
+	c.Assert(err.Error(), Equals, "Block verification failed for 2 out of 2 blocks with matching prefix")
 	checkErrorLog(c, []string{TestHash, TestHash2}, "Error verifying block", "")
 }
 
@@ -353,7 +353,7 @@ func (s *DoMainTestSuite) Test_doMain(c *C) {
 	args := []string{"-config", config, "-block-hash-file", locatorFile, "-v"}
 	err := doMain(args)
 	c.Check(err, NotNil)
-	c.Assert(err.Error(), Equals, "Block verification failed for 2 out of 2 blocks with matching prefix.")
+	c.Assert(err.Error(), Equals, "Block verification failed for 2 out of 2 blocks with matching prefix")
 	checkErrorLog(c, []string{TestHash, TestHash2}, "Error verifying block", "Block not found")
 	c.Assert(strings.Contains(logBuffer.String(), "Verifying block 1 of 2"), Equals, true)
 }

-----------------------------------------------------------------------


hooks/post-receive
--