X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/22fcc610c13c817c415cff26f2c94c17f271e4d3..10440ac12d6771ab80469adf551d2cac8d3461e6:/tools/keep-block-check/keep-block-check_test.go

diff --git a/tools/keep-block-check/keep-block-check_test.go b/tools/keep-block-check/keep-block-check_test.go
index 9f409e6af0..4dcb47a8da 100644
--- a/tools/keep-block-check/keep-block-check_test.go
+++ b/tools/keep-block-check/keep-block-check_test.go
@@ -43,12 +43,7 @@ var TestHash2 = "aaaac516f788aec4f30932ffb6395c39"
 
 var blobSignatureTTL = time.Duration(2*7*24) * time.Hour
 
-func (s *ServerRequiredSuite) SetUpSuite(c *C) {
-	arvadostest.StartAPI()
-}
-
 func (s *ServerRequiredSuite) TearDownSuite(c *C) {
-	arvadostest.StopAPI()
 	arvadostest.ResetEnv()
 }
 
@@ -123,7 +118,6 @@ func setupConfigFile(c *C, fileName string) string {
 	fileContent += "ARVADOS_API_TOKEN=" + arvadostest.DataManagerToken + "\n"
 	fileContent += "\n"
 	fileContent += "ARVADOS_API_HOST_INSECURE=" + os.Getenv("ARVADOS_API_HOST_INSECURE") + "\n"
-	fileContent += " ARVADOS_EXTERNAL_CLIENT = false \n"
 	fileContent += " NotANameValuePairAndShouldGetIgnored \n"
 	fileContent += "ARVADOS_BLOB_SIGNING_KEY=abcdefg\n"
 
@@ -296,22 +290,23 @@ func (s *ServerRequiredSuite) TestLoadConfig(c *C) {
 	c.Assert(config.APIHost, Equals, os.Getenv("ARVADOS_API_HOST"))
 	c.Assert(config.APIToken, Equals, arvadostest.DataManagerToken)
 	c.Assert(config.APIHostInsecure, Equals, arvadosclient.StringBool(os.Getenv("ARVADOS_API_HOST_INSECURE")))
-	c.Assert(config.ExternalClient, Equals, false)
 	c.Assert(blobSigningKey, Equals, "abcdefg")
 }
 
 func (s *DoMainTestSuite) Test_doMain_WithNoConfig(c *C) {
 	args := []string{"-prefix", "a"}
-	err := doMain(args)
-	c.Check(err, NotNil)
-	c.Assert(strings.Contains(err.Error(), "config file not specified"), Equals, true)
+	var stderr bytes.Buffer
+	code := doMain(args, &stderr)
+	c.Check(code, Equals, 1)
+	c.Check(stderr.String(), Matches, ".*config file not specified\n")
 }
 
 func (s *DoMainTestSuite) Test_doMain_WithNoSuchConfigFile(c *C) {
 	args := []string{"-config", "no-such-file"}
-	err := doMain(args)
-	c.Check(err, NotNil)
-	c.Assert(strings.Contains(err.Error(), "no such file or directory"), Equals, true)
+	var stderr bytes.Buffer
+	code := doMain(args, &stderr)
+	c.Check(code, Equals, 1)
+	c.Check(stderr.String(), Matches, ".*no such file or directory\n")
 }
 
 func (s *DoMainTestSuite) Test_doMain_WithNoBlockHashFile(c *C) {
@@ -323,8 +318,10 @@ func (s *DoMainTestSuite) Test_doMain_WithNoBlockHashFile(c *C) {
 	defer arvadostest.StopKeep(2)
 
 	args := []string{"-config", config}
-	err := doMain(args)
-	c.Assert(strings.Contains(err.Error(), "block-hash-file not specified"), Equals, true)
+	var stderr bytes.Buffer
+	code := doMain(args, &stderr)
+	c.Check(code, Equals, 1)
+	c.Check(stderr.String(), Matches, ".*block-hash-file not specified\n")
 }
 
 func (s *DoMainTestSuite) Test_doMain_WithNoSuchBlockHashFile(c *C) {
@@ -335,8 +332,10 @@ func (s *DoMainTestSuite) Test_doMain_WithNoSuchBlockHashFile(c *C) {
 	defer arvadostest.StopKeep(2)
 
 	args := []string{"-config", config, "-block-hash-file", "no-such-file"}
-	err := doMain(args)
-	c.Assert(strings.Contains(err.Error(), "no such file or directory"), Equals, true)
+	var stderr bytes.Buffer
+	code := doMain(args, &stderr)
+	c.Check(code, Equals, 1)
+	c.Check(stderr.String(), Matches, ".*no such file or directory\n")
 }
 
 func (s *DoMainTestSuite) Test_doMain(c *C) {
@@ -351,9 +350,10 @@ func (s *DoMainTestSuite) Test_doMain(c *C) {
 	defer os.Remove(locatorFile)
 
 	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")
+	var stderr bytes.Buffer
+	code := doMain(args, &stderr)
+	c.Check(code, Equals, 1)
+	c.Assert(stderr.String(), Matches, "Block verification failed for 2 out of 2 blocks with matching prefix\n")
 	checkErrorLog(c, []string{TestHash, TestHash2}, "Error verifying block", "Block not found")
 	c.Assert(strings.Contains(logBuffer.String(), "Verifying block 1 of 2"), Equals, true)
 }