projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
49fccd5
)
7724: Use datamanager token in keep-rsync tests. refs #7724
author
Tom Clegg <tom@curoverse.com>
Fri, 6 Nov 2015 04:17:32 +0000
(23:17 -0500)
committer
Tom Clegg <tom@curoverse.com>
Fri, 6 Nov 2015 04:17:32 +0000
(23:17 -0500)
tools/keep-rsync/keep-rsync_test.go
patch
|
blob
|
history
diff --git
a/tools/keep-rsync/keep-rsync_test.go
b/tools/keep-rsync/keep-rsync_test.go
index e72889038850631bb8205ee1602326d307d729fc..9432a0d383b534236ff506c83ac98ed0c196c324 100644
(file)
--- 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
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")
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 {
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.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)
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.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)
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"
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"
fileContent += "ARVADOS_API_HOST_INSECURE=" + os.Getenv("ARVADOS_API_HOST_INSECURE") + "\n"
fileContent += "ARVADOS_EXTERNAL_CLIENT=false\n"
fileContent += "ARVADOS_BLOB_SIGNING_KEY=abcdefg"