[ARVADOS] updated: 4ec9919ea6cce4ada252f1e0a0dc521fe27e508c

git at public.curoverse.com git at public.curoverse.com
Fri Nov 6 00:30:39 EST 2015


Summary of changes:
 tools/keep-rsync/keep-rsync_test.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

       via  4ec9919ea6cce4ada252f1e0a0dc521fe27e508c (commit)
      from  49fccd5b00230418a0918a33d4fb9154af63220a (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 4ec9919ea6cce4ada252f1e0a0dc521fe27e508c
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 5 23:17:32 2015 -0500

    7724: Use datamanager token in keep-rsync tests. refs #7724

diff --git a/tools/keep-rsync/keep-rsync_test.go b/tools/keep-rsync/keep-rsync_test.go
index e728890..9432a0d 100644
--- a/tools/keep-rsync/keep-rsync_test.go
+++ b/tools/keep-rsync/keep-rsync_test.go
@@ -81,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 {
@@ -389,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)
 
@@ -397,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)
 
@@ -422,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"

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list