projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17507-listobjectsv2'
[arvados.git]
/
tools
/
sync-groups
/
federation_test.go
diff --git
a/tools/sync-groups/federation_test.go
b/tools/sync-groups/federation_test.go
index 2462383f3e4ddc727c1336c156eacb18590417c5..1bbdaa3fa3cb5d3b60387ca0cc1d17723957be55 100644
(file)
--- a/
tools/sync-groups/federation_test.go
+++ b/
tools/sync-groups/federation_test.go
@@
-5,12
+5,16
@@
package main
import (
package main
import (
+ "bytes"
"net"
"os"
"path/filepath"
"net"
"os"
"path/filepath"
+ "git.arvados.org/arvados.git/lib/boot"
+ "git.arvados.org/arvados.git/lib/config"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadostest"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadostest"
+ "git.arvados.org/arvados.git/sdk/go/ctxlog"
check "gopkg.in/check.v1"
)
check "gopkg.in/check.v1"
)
@@
-19,7
+23,7
@@
var _ = check.Suite(&FederationSuite{})
var origAPIHost, origAPIToken string
type FederationSuite struct {
var origAPIHost, origAPIToken string
type FederationSuite struct {
- testClusters map[string]*
arvadostes
t.TestCluster
+ testClusters map[string]*
boo
t.TestCluster
oidcprovider *arvadostest.OIDCProvider
}
oidcprovider *arvadostest.OIDCProvider
}
@@
-36,7
+40,7
@@
func (s *FederationSuite) SetUpSuite(c *check.C) {
s.oidcprovider.ValidClientID = "clientid"
s.oidcprovider.ValidClientSecret = "clientsecret"
s.oidcprovider.ValidClientID = "clientid"
s.oidcprovider.ValidClientSecret = "clientsecret"
- s.testClusters = map[string]*
arvadostes
t.TestCluster{
+ s.testClusters = map[string]*
boo
t.TestCluster{
"z1111": nil,
"z2222": nil,
}
"z1111": nil,
"z2222": nil,
}
@@
-101,12
+105,18
@@
func (s *FederationSuite) SetUpSuite(c *check.C) {
`
}
`
}
- tc, err := arvadostest.NewTestCluster(
- filepath.Join(cwd, "..", ".."),
- id, yaml, "127.0.0."+id[3:], c.Log)
+ loader := config.NewLoader(bytes.NewBufferString(yaml), ctxlog.TestLogger(c))
+ loader.Path = "-"
+ loader.SkipLegacy = true
+ loader.SkipAPICalls = true
+ cfg, err := loader.Load()
c.Assert(err, check.IsNil)
c.Assert(err, check.IsNil)
+ tc := boot.NewTestCluster(
+ filepath.Join(cwd, "..", ".."),
+ id, cfg, "127.0.0."+id[3:], c.Log)
+ tc.Super.NoWorkbench1 = true
+ tc.Start()
s.testClusters[id] = tc
s.testClusters[id] = tc
- s.testClusters[id].Start()
}
for _, tc := range s.testClusters {
ok := tc.WaitReady()
}
for _, tc := range s.testClusters {
ok := tc.WaitReady()