projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16981: Removes the import cycle issue by moving code to lib/boot.
[arvados.git]
/
lib
/
controller
/
integration_test.go
diff --git
a/lib/controller/integration_test.go
b/lib/controller/integration_test.go
index d93ffd64dce2354e020d45f69144f4d1ddbcd4cf..0e95c19ea5ca06aef24e815a2f280a40257f7267 100644
(file)
--- a/
lib/controller/integration_test.go
+++ b/
lib/controller/integration_test.go
@@
-19,6
+19,7
@@
import (
"strconv"
"strings"
"strconv"
"strings"
+ "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/lib/config"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadostest"
@@
-29,7
+30,7
@@
import (
var _ = check.Suite(&IntegrationSuite{})
type IntegrationSuite struct {
var _ = check.Suite(&IntegrationSuite{})
type IntegrationSuite struct {
- testClusters map[string]*
arvadostes
t.TestCluster
+ testClusters map[string]*
boo
t.TestCluster
oidcprovider *arvadostest.OIDCProvider
}
oidcprovider *arvadostest.OIDCProvider
}
@@
-48,7
+49,7
@@
func (s *IntegrationSuite) 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,
"z3333": nil,
"z1111": nil,
"z2222": nil,
"z3333": nil,
@@
-129,7
+130,7
@@
func (s *IntegrationSuite) SetUpSuite(c *check.C) {
loader.SkipAPICalls = true
cfg, err := loader.Load()
c.Assert(err, check.IsNil)
loader.SkipAPICalls = true
cfg, err := loader.Load()
c.Assert(err, check.IsNil)
- tc :=
arvadostes
t.NewTestCluster(
+ tc :=
boo
t.NewTestCluster(
filepath.Join(cwd, "..", ".."),
id, cfg, "127.0.0."+id[3:], c.Log)
s.testClusters[id] = tc
filepath.Join(cwd, "..", ".."),
id, cfg, "127.0.0."+id[3:], c.Log)
s.testClusters[id] = tc