As the code was really meant to be lib/boot helpers, instead of having
it on the arvadostest package, it's now on lib/boot/helper.go
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
import (
"context"
"net/url"
import (
"context"
"net/url"
- "git.arvados.org/arvados.git/lib/boot"
"git.arvados.org/arvados.git/lib/controller/rpc"
"git.arvados.org/arvados.git/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/lib/controller/rpc"
"git.arvados.org/arvados.git/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
// TestCluster stores a working test cluster data
type TestCluster struct {
// TestCluster stores a working test cluster data
type TestCluster struct {
Config arvados.Config
ControllerURL *url.URL
ClusterID string
Config arvados.Config
ControllerURL *url.URL
ClusterID string
// ready for being started.
func NewTestCluster(srcPath, clusterID string, cfg *arvados.Config, listenHost string, logWriter func(...interface{})) *TestCluster {
return &TestCluster{
// ready for being started.
func NewTestCluster(srcPath, clusterID string, cfg *arvados.Config, listenHost string, logWriter func(...interface{})) *TestCluster {
return &TestCluster{
- Super: boot.Supervisor{
SourcePath: srcPath,
ClusterType: "test",
ListenHost: listenHost,
SourcePath: srcPath,
ClusterType: "test",
ListenHost: listenHost,
+ "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"
var _ = check.Suite(&IntegrationSuite{})
type IntegrationSuite struct {
var _ = check.Suite(&IntegrationSuite{})
type IntegrationSuite struct {
- testClusters map[string]*arvadostest.TestCluster
+ testClusters map[string]*boot.TestCluster
oidcprovider *arvadostest.OIDCProvider
}
oidcprovider *arvadostest.OIDCProvider
}
s.oidcprovider.ValidClientID = "clientid"
s.oidcprovider.ValidClientSecret = "clientsecret"
s.oidcprovider.ValidClientID = "clientid"
s.oidcprovider.ValidClientSecret = "clientsecret"
- s.testClusters = map[string]*arvadostest.TestCluster{
+ s.testClusters = map[string]*boot.TestCluster{
"z1111": nil,
"z2222": nil,
"z3333": nil,
"z1111": nil,
"z2222": nil,
"z3333": nil,
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 := arvadostest.NewTestCluster(
+ tc := boot.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
+ "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"
var origAPIHost, origAPIToken string
type FederationSuite struct {
var origAPIHost, origAPIToken string
type FederationSuite struct {
- testClusters map[string]*arvadostest.TestCluster
+ testClusters map[string]*boot.TestCluster
oidcprovider *arvadostest.OIDCProvider
}
oidcprovider *arvadostest.OIDCProvider
}
s.oidcprovider.ValidClientID = "clientid"
s.oidcprovider.ValidClientSecret = "clientsecret"
s.oidcprovider.ValidClientID = "clientid"
s.oidcprovider.ValidClientSecret = "clientsecret"
- s.testClusters = map[string]*arvadostest.TestCluster{
+ s.testClusters = map[string]*boot.TestCluster{
"z1111": nil,
"z2222": nil,
}
"z1111": nil,
"z2222": nil,
}
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 := arvadostest.NewTestCluster(
+ tc := boot.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