From 13b280ea288fd08e8c77300b087037635d739eaa Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curii.com>
Date: Thu, 5 Aug 2021 17:57:50 -0400
Subject: [PATCH] 17967: Update tests.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---
 lib/boot/supervisor.go             |  5 +++++
 services/keepstore/handler_test.go | 17 ++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 4e009f45ab..2026b8c843 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -748,6 +748,11 @@ func (super *Supervisor) autofillConfig(cfg *arvados.Config) error {
 				},
 			}
 		}
+		cluster.StorageClasses = map[string]arvados.StorageClassConfig{
+			"default": {Default: true},
+			"foo":     {},
+			"bar":     {},
+		}
 	}
 	if super.OwnTemporaryDatabase {
 		cluster.PostgreSQL.Connection = arvados.PostgreSQLConnection{
diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index 00ef11b6ef..897447dd11 100644
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -21,7 +21,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
-	"regexp"
 	"sort"
 	"strings"
 	"time"
@@ -545,12 +544,8 @@ func (s *HandlerSuite) TestIndexHandler(c *check.C) {
 
 	expected := `^` + TestHash + `\+\d+ \d+\n` +
 		TestHash2 + `\+\d+ \d+\n\n$`
-	match, _ := regexp.MatchString(expected, response.Body.String())
-	if !match {
-		c.Errorf(
-			"permissions on, superuser request: expected %s, got:\n%s",
-			expected, response.Body.String())
-	}
+	c.Check(response.Body.String(), check.Matches, expected, check.Commentf(
+		"permissions on, superuser request"))
 
 	// superuser /index/prefix request
 	// => OK
@@ -561,12 +556,8 @@ func (s *HandlerSuite) TestIndexHandler(c *check.C) {
 		response)
 
 	expected = `^` + TestHash + `\+\d+ \d+\n\n$`
-	match, _ = regexp.MatchString(expected, response.Body.String())
-	if !match {
-		c.Errorf(
-			"permissions on, superuser /index/prefix request: expected %s, got:\n%s",
-			expected, response.Body.String())
-	}
+	c.Check(response.Body.String(), check.Matches, expected, check.Commentf(
+		"permissions on, superuser /index/prefix request"))
 
 	// superuser /index/{no-such-prefix} request
 	// => OK
-- 
2.30.2