projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17650: Fix test order dependency.
[arvados.git]
/
lib
/
controller
/
integration_test.go
diff --git
a/lib/controller/integration_test.go
b/lib/controller/integration_test.go
index db1f7f0d0cee51b359c6d10f9ddd1e1b5de790e3..7b1dcbea6655bcf5f86b175c58ad2f9d5382b74d 100644
(file)
--- a/
lib/controller/integration_test.go
+++ b/
lib/controller/integration_test.go
@@
-37,11
+37,6
@@
type IntegrationSuite struct {
}
func (s *IntegrationSuite) SetUpSuite(c *check.C) {
}
func (s *IntegrationSuite) SetUpSuite(c *check.C) {
- if forceLegacyAPI14 {
- c.Skip("heavy integration tests don't run with forceLegacyAPI14")
- return
- }
-
cwd, _ := os.Getwd()
s.oidcprovider = arvadostest.NewOIDCProvider(c)
cwd, _ := os.Getwd()
s.oidcprovider = arvadostest.NewOIDCProvider(c)
@@
-135,8
+130,9
@@
func (s *IntegrationSuite) SetUpSuite(c *check.C) {
tc := boot.NewTestCluster(
filepath.Join(cwd, "..", ".."),
id, cfg, "127.0.0."+id[3:], c.Log)
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()