projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7711: Store cloud node size id and price in properties of Arvados node record.
[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 3e57407369c0dccf8216e3e0835820c0bc419b55..52b59ec1ef797b1e09b25529b20285f5190166df 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()
@@
-82,6
+82,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
+99,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)
}
@@
-128,7
+132,7
@@
func performPullWorkerIntegrationTest(testData PullWorkIntegrationTestData, pull
return rdr, int64(len(testData.Content)), "", nil
}
return rdr, int64(len(testData.Content)), "", nil
}
- keepClient.Arvados.ApiToken = GenerateRandomA
pi
Token()
+ keepClient.Arvados.ApiToken = GenerateRandomA
PI
Token()
err := PullItemAndProcess(pullRequest, keepClient.Arvados.ApiToken, keepClient)
if len(testData.GetError) > 0 {
err := PullItemAndProcess(pullRequest, keepClient.Arvados.ApiToken, keepClient)
if len(testData.GetError) > 0 {