projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7965: Fail orphaned jobs still marked "running" after reboot.
[arvados.git]
/
services
/
keepstore
/
pull_worker_integration_test.go
diff --git
a/services/keepstore/pull_worker_integration_test.go
b/services/keepstore/pull_worker_integration_test.go
index e0bad0045af34d8067591fa723e9229be093790c..e0613a2cd12685195d841c2ef2ae31f7b90f60bb 100644
(file)
--- a/
services/keepstore/pull_worker_integration_test.go
+++ b/
services/keepstore/pull_worker_integration_test.go
@@
-27,7
+27,7
@@
func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
// start api and keep servers
arvadostest.StartAPI()
// start api and keep servers
arvadostest.StartAPI()
- arvadostest.StartKeep()
+ arvadostest.StartKeep(
2, false
)
// make arvadosclient
arv, err := arvadosclient.MakeArvadosClient()
// make arvadosclient
arv, err := arvadosclient.MakeArvadosClient()
@@
-39,7
+39,6
@@
func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
keepClient = &keepclient.KeepClient{
Arvados: &arv,
Want_replicas: 1,
keepClient = &keepclient.KeepClient{
Arvados: &arv,
Want_replicas: 1,
- Using_proxy: true,
Client: &http.Client{},
}
Client: &http.Client{},
}
@@
-82,6
+81,8
@@
func TestPullWorkerIntegration_GetNonExistingLocator(t *testing.T) {
}
pullRequest := SetupPullWorkerIntegrationTest(t, testData, false)
}
pullRequest := SetupPullWorkerIntegrationTest(t, testData, false)
+ defer arvadostest.StopAPI()
+ defer arvadostest.StopKeep(2)
performPullWorkerIntegrationTest(testData, pullRequest, t)
}
performPullWorkerIntegrationTest(testData, pullRequest, t)
}
@@
-97,6
+98,8
@@
func TestPullWorkerIntegration_GetExistingLocator(t *testing.T) {
}
pullRequest := SetupPullWorkerIntegrationTest(t, testData, true)
}
pullRequest := SetupPullWorkerIntegrationTest(t, testData, true)
+ defer arvadostest.StopAPI()
+ defer arvadostest.StopKeep(2)
performPullWorkerIntegrationTest(testData, pullRequest, t)
}
performPullWorkerIntegrationTest(testData, pullRequest, t)
}