X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a9e08c498ac8126026d1226f34913f87c8e590a0..d9ab654450fd23c043beab5c19c99806a301e51c:/tools/keep-rsync/keep-rsync_test.go

diff --git a/tools/keep-rsync/keep-rsync_test.go b/tools/keep-rsync/keep-rsync_test.go
index 6fbb535a03..94281fa8bc 100644
--- a/tools/keep-rsync/keep-rsync_test.go
+++ b/tools/keep-rsync/keep-rsync_test.go
@@ -4,6 +4,7 @@ import (
 	"crypto/md5"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
 	"strings"
 	"testing"
@@ -80,13 +81,13 @@ func setupRsync(c *C, enforcePermissions bool, replications int) {
 	// srcConfig
 	var srcConfig apiConfig
 	srcConfig.APIHost = os.Getenv("ARVADOS_API_HOST")
-	srcConfig.APIToken = os.Getenv("ARVADOS_API_TOKEN")
+	srcConfig.APIToken = arvadostest.DataManagerToken
 	srcConfig.APIHostInsecure = matchTrue.MatchString(os.Getenv("ARVADOS_API_HOST_INSECURE"))
 
 	// dstConfig
 	var dstConfig apiConfig
 	dstConfig.APIHost = os.Getenv("ARVADOS_API_HOST")
-	dstConfig.APIToken = os.Getenv("ARVADOS_API_TOKEN")
+	dstConfig.APIToken = arvadostest.DataManagerToken
 	dstConfig.APIHostInsecure = matchTrue.MatchString(os.Getenv("ARVADOS_API_HOST_INSECURE"))
 
 	if enforcePermissions {
@@ -327,7 +328,8 @@ func (s *ServerRequiredSuite) TestErrorDuringRsync_FakeSrcKeepservers(c *C) {
 	setupRsync(c, false, 1)
 
 	err := performKeepRsync(kcSrc, kcDst, "", "")
-	c.Check(strings.HasSuffix(err.Error(), "no such host"), Equals, true)
+	log.Printf("Err = %v", err)
+	c.Check(strings.Contains(err.Error(), "no such host"), Equals, true)
 }
 
 // Setup rsync using dstKeepServicesJSON with fake keepservers.
@@ -338,7 +340,8 @@ func (s *ServerRequiredSuite) TestErrorDuringRsync_FakeDstKeepservers(c *C) {
 	setupRsync(c, false, 1)
 
 	err := performKeepRsync(kcSrc, kcDst, "", "")
-	c.Check(strings.HasSuffix(err.Error(), "no such host"), Equals, true)
+	log.Printf("Err = %v", err)
+	c.Check(strings.Contains(err.Error(), "no such host"), Equals, true)
 }
 
 // Test rsync with signature error during Get from src.
@@ -352,7 +355,7 @@ func (s *ServerRequiredSuite) TestErrorDuringRsync_ErrorGettingBlockFromSrc(c *C
 	blobSigningKey = "thisisfakeblobsigningkey"
 
 	err := performKeepRsync(kcSrc, kcDst, blobSigningKey, "")
-	c.Check(strings.HasSuffix(err.Error(), "Block not found"), Equals, true)
+	c.Check(strings.Contains(err.Error(), "HTTP 403 \"Forbidden\""), Equals, true)
 }
 
 // Test rsync with error during Put to src.
@@ -366,7 +369,7 @@ func (s *ServerRequiredSuite) TestErrorDuringRsync_ErrorPuttingBlockInDst(c *C)
 	kcDst.Want_replicas = 2
 
 	err := performKeepRsync(kcSrc, kcDst, blobSigningKey, "")
-	c.Check(strings.HasSuffix(err.Error(), "Could not write sufficient replicas"), Equals, true)
+	c.Check(strings.Contains(err.Error(), "Could not write sufficient replicas"), Equals, true)
 }
 
 // Test loadConfig func
@@ -386,7 +389,7 @@ func (s *ServerNotRequiredSuite) TestLoadConfig(c *C) {
 	c.Check(err, IsNil)
 
 	c.Assert(srcConfig.APIHost, Equals, os.Getenv("ARVADOS_API_HOST"))
-	c.Assert(srcConfig.APIToken, Equals, os.Getenv("ARVADOS_API_TOKEN"))
+	c.Assert(srcConfig.APIToken, Equals, arvadostest.DataManagerToken)
 	c.Assert(srcConfig.APIHostInsecure, Equals, matchTrue.MatchString(os.Getenv("ARVADOS_API_HOST_INSECURE")))
 	c.Assert(srcConfig.ExternalClient, Equals, false)
 
@@ -394,7 +397,7 @@ func (s *ServerNotRequiredSuite) TestLoadConfig(c *C) {
 	c.Check(err, IsNil)
 
 	c.Assert(dstConfig.APIHost, Equals, os.Getenv("ARVADOS_API_HOST"))
-	c.Assert(dstConfig.APIToken, Equals, os.Getenv("ARVADOS_API_TOKEN"))
+	c.Assert(dstConfig.APIToken, Equals, arvadostest.DataManagerToken)
 	c.Assert(dstConfig.APIHostInsecure, Equals, matchTrue.MatchString(os.Getenv("ARVADOS_API_HOST_INSECURE")))
 	c.Assert(dstConfig.ExternalClient, Equals, false)
 
@@ -410,7 +413,7 @@ func (s *ServerNotRequiredSuite) TestLoadConfig_MissingSrcConfig(c *C) {
 // Test loadConfig func - error reading config
 func (s *ServerNotRequiredSuite) TestLoadConfig_ErrorLoadingSrcConfig(c *C) {
 	_, _, err := loadConfig("no-such-config-file")
-	c.Assert(strings.HasSuffix(err.Error(), "no such file or directory"), Equals, true)
+	c.Assert(strings.Contains(err.Error(), "no such file or directory"), Equals, true)
 }
 
 func setupConfigFile(c *C, name string) *os.File {
@@ -419,7 +422,7 @@ func setupConfigFile(c *C, name string) *os.File {
 	c.Check(err, IsNil)
 
 	fileContent := "ARVADOS_API_HOST=" + os.Getenv("ARVADOS_API_HOST") + "\n"
-	fileContent += "ARVADOS_API_TOKEN=" + os.Getenv("ARVADOS_API_TOKEN") + "\n"
+	fileContent += "ARVADOS_API_TOKEN=" + arvadostest.DataManagerToken + "\n"
 	fileContent += "ARVADOS_API_HOST_INSECURE=" + os.Getenv("ARVADOS_API_HOST_INSECURE") + "\n"
 	fileContent += "ARVADOS_EXTERNAL_CLIENT=false\n"
 	fileContent += "ARVADOS_BLOB_SIGNING_KEY=abcdefg"
@@ -467,9 +470,11 @@ func (s *DoMainTestSuite) Test_doMainWithSrcAndDstConfig(c *C) {
 	args := []string{"-src", srcConfig.Name(), "-dst", dstConfig.Name()}
 	os.Args = append(os.Args, args...)
 
-	// Start keepservers. Since we are not doing any tweaking as in setupRsync func,
-	// kcSrc and kcDst will be the same and no actual copying to dst will happen, but that's ok.
+	// Start keepservers. Since we are not doing any tweaking as
+	// in setupRsync func, kcSrc and kcDst will be the same and no
+	// actual copying to dst will happen, but that's ok.
 	arvadostest.StartKeep(2, false)
+	defer arvadostest.StopKeep(2)
 
 	err := doMain()
 	c.Check(err, IsNil)