projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8709: Docker cleaner cleans container volumes.
[arvados.git]
/
services
/
keepstore
/
pull_worker_test.go
diff --git
a/services/keepstore/pull_worker_test.go
b/services/keepstore/pull_worker_test.go
index ed0d24ae8cb476459bb05f17aa48667d2951a8c4..5076b85e20703e8305b74ab4ce5a048cd17a81b0 100644
(file)
--- a/
services/keepstore/pull_worker_test.go
+++ b/
services/keepstore/pull_worker_test.go
@@
-8,20
+8,13
@@
import (
. "gopkg.in/check.v1"
"io"
"net/http"
. "gopkg.in/check.v1"
"io"
"net/http"
- "testing"
"time"
)
"time"
)
-type PullWorkerTestSuite struct{}
-
-// Gocheck boilerplate
-func TestPullWorker(t *testing.T) {
- TestingT(t)
-}
-
-// Gocheck boilerplate
var _ = Suite(&PullWorkerTestSuite{})
var _ = Suite(&PullWorkerTestSuite{})
+type PullWorkerTestSuite struct{}
+
var testPullLists map[string]string
var readContent string
var readError error
var testPullLists map[string]string
var readContent string
var readError error
@@
-91,10
+84,10
@@
type PullWorkerTestData struct {
func (s *PullWorkerTestSuite) TestPullWorkerPullList_with_two_locators(c *C) {
defer teardown()
func (s *PullWorkerTestSuite) TestPullWorkerPullList_with_two_locators(c *C) {
defer teardown()
- data
_manager_t
oken = "DATA MANAGER TOKEN"
+ data
ManagerT
oken = "DATA MANAGER TOKEN"
testData := PullWorkerTestData{
name: "TestPullWorkerPullList_with_two_locators",
testData := PullWorkerTestData{
name: "TestPullWorkerPullList_with_two_locators",
- req: RequestTester{"/pull", data
_manager_t
oken, "PUT", firstPullList},
+ req: RequestTester{"/pull", data
ManagerT
oken, "PUT", firstPullList},
responseCode: http.StatusOK,
responseBody: "Received 2 pull requests\n",
readContent: "hello",
responseCode: http.StatusOK,
responseBody: "Received 2 pull requests\n",
readContent: "hello",
@@
-108,10
+101,10
@@
func (s *PullWorkerTestSuite) TestPullWorkerPullList_with_two_locators(c *C) {
func (s *PullWorkerTestSuite) TestPullWorkerPullList_with_one_locator(c *C) {
defer teardown()
func (s *PullWorkerTestSuite) TestPullWorkerPullList_with_one_locator(c *C) {
defer teardown()
- data
_manager_t
oken = "DATA MANAGER TOKEN"
+ data
ManagerT
oken = "DATA MANAGER TOKEN"
testData := PullWorkerTestData{
name: "TestPullWorkerPullList_with_one_locator",
testData := PullWorkerTestData{
name: "TestPullWorkerPullList_with_one_locator",
- req: RequestTester{"/pull", data
_manager_t
oken, "PUT", secondPullList},
+ req: RequestTester{"/pull", data
ManagerT
oken, "PUT", secondPullList},
responseCode: http.StatusOK,
responseBody: "Received 1 pull requests\n",
readContent: "hola",
responseCode: http.StatusOK,
responseBody: "Received 1 pull requests\n",
readContent: "hola",
@@
-125,10
+118,10
@@
func (s *PullWorkerTestSuite) TestPullWorkerPullList_with_one_locator(c *C) {
func (s *PullWorkerTestSuite) TestPullWorker_error_on_get_one_locator(c *C) {
defer teardown()
func (s *PullWorkerTestSuite) TestPullWorker_error_on_get_one_locator(c *C) {
defer teardown()
- data
_manager_t
oken = "DATA MANAGER TOKEN"
+ data
ManagerT
oken = "DATA MANAGER TOKEN"
testData := PullWorkerTestData{
name: "TestPullWorker_error_on_get_one_locator",
testData := PullWorkerTestData{
name: "TestPullWorker_error_on_get_one_locator",
- req: RequestTester{"/pull", data
_manager_t
oken, "PUT", secondPullList},
+ req: RequestTester{"/pull", data
ManagerT
oken, "PUT", secondPullList},
responseCode: http.StatusOK,
responseBody: "Received 1 pull requests\n",
readContent: "unused",
responseCode: http.StatusOK,
responseBody: "Received 1 pull requests\n",
readContent: "unused",
@@
-142,10
+135,10
@@
func (s *PullWorkerTestSuite) TestPullWorker_error_on_get_one_locator(c *C) {
func (s *PullWorkerTestSuite) TestPullWorker_error_on_get_two_locators(c *C) {
defer teardown()
func (s *PullWorkerTestSuite) TestPullWorker_error_on_get_two_locators(c *C) {
defer teardown()
- data
_manager_t
oken = "DATA MANAGER TOKEN"
+ data
ManagerT
oken = "DATA MANAGER TOKEN"
testData := PullWorkerTestData{
name: "TestPullWorker_error_on_get_two_locators",
testData := PullWorkerTestData{
name: "TestPullWorker_error_on_get_two_locators",
- req: RequestTester{"/pull", data
_manager_t
oken, "PUT", firstPullList},
+ req: RequestTester{"/pull", data
ManagerT
oken, "PUT", firstPullList},
responseCode: http.StatusOK,
responseBody: "Received 2 pull requests\n",
readContent: "unused",
responseCode: http.StatusOK,
responseBody: "Received 2 pull requests\n",
readContent: "unused",
@@
-159,10
+152,10
@@
func (s *PullWorkerTestSuite) TestPullWorker_error_on_get_two_locators(c *C) {
func (s *PullWorkerTestSuite) TestPullWorker_error_on_put_one_locator(c *C) {
defer teardown()
func (s *PullWorkerTestSuite) TestPullWorker_error_on_put_one_locator(c *C) {
defer teardown()
- data
_manager_t
oken = "DATA MANAGER TOKEN"
+ data
ManagerT
oken = "DATA MANAGER TOKEN"
testData := PullWorkerTestData{
name: "TestPullWorker_error_on_put_one_locator",
testData := PullWorkerTestData{
name: "TestPullWorker_error_on_put_one_locator",
- req: RequestTester{"/pull", data
_manager_t
oken, "PUT", secondPullList},
+ req: RequestTester{"/pull", data
ManagerT
oken, "PUT", secondPullList},
responseCode: http.StatusOK,
responseBody: "Received 1 pull requests\n",
readContent: "hello hello",
responseCode: http.StatusOK,
responseBody: "Received 1 pull requests\n",
readContent: "hello hello",
@@
-176,10
+169,10
@@
func (s *PullWorkerTestSuite) TestPullWorker_error_on_put_one_locator(c *C) {
func (s *PullWorkerTestSuite) TestPullWorker_error_on_put_two_locators(c *C) {
defer teardown()
func (s *PullWorkerTestSuite) TestPullWorker_error_on_put_two_locators(c *C) {
defer teardown()
- data
_manager_t
oken = "DATA MANAGER TOKEN"
+ data
ManagerT
oken = "DATA MANAGER TOKEN"
testData := PullWorkerTestData{
name: "TestPullWorker_error_on_put_two_locators",
testData := PullWorkerTestData{
name: "TestPullWorker_error_on_put_two_locators",
- req: RequestTester{"/pull", data
_manager_t
oken, "PUT", firstPullList},
+ req: RequestTester{"/pull", data
ManagerT
oken, "PUT", firstPullList},
responseCode: http.StatusOK,
responseBody: "Received 2 pull requests\n",
readContent: "hello again",
responseCode: http.StatusOK,
responseBody: "Received 2 pull requests\n",
readContent: "hello again",
@@
-202,10
+195,10
@@
func (s *PullWorkerTestSuite) TestPullWorkerPullList_with_two_items_latest_repla
pullq.ReplaceQueue(makeTestWorkList(firstInput))
testPullLists["Added_before_actual_test_item"] = string(1)
pullq.ReplaceQueue(makeTestWorkList(firstInput))
testPullLists["Added_before_actual_test_item"] = string(1)
- data
_manager_t
oken = "DATA MANAGER TOKEN"
+ data
ManagerT
oken = "DATA MANAGER TOKEN"
testData := PullWorkerTestData{
name: "TestPullWorkerPullList_with_two_items_latest_replacing_old",
testData := PullWorkerTestData{
name: "TestPullWorkerPullList_with_two_items_latest_replacing_old",
- req: RequestTester{"/pull", data
_manager_t
oken, "PUT", secondPullList},
+ req: RequestTester{"/pull", data
ManagerT
oken, "PUT", secondPullList},
responseCode: http.StatusOK,
responseBody: "Received 1 pull requests\n",
readContent: "hola de nuevo",
responseCode: http.StatusOK,
responseBody: "Received 1 pull requests\n",
readContent: "hola de nuevo",
@@
-217,14
+210,14
@@
func (s *PullWorkerTestSuite) TestPullWorkerPullList_with_two_items_latest_repla
}
// In this case, the item will not be placed on pullq
}
// In this case, the item will not be placed on pullq
-func (s *PullWorkerTestSuite) TestPullWorker_invalid_data
_manager_t
oken(c *C) {
+func (s *PullWorkerTestSuite) TestPullWorker_invalid_data
ManagerT
oken(c *C) {
defer teardown()
defer teardown()
- data
_manager_t
oken = "DATA MANAGER TOKEN"
+ data
ManagerT
oken = "DATA MANAGER TOKEN"
testData := PullWorkerTestData{
name: "TestPullWorkerPullList_with_two_locators",
testData := PullWorkerTestData{
name: "TestPullWorkerPullList_with_two_locators",
- req: RequestTester{"/pull", "invalid_data
_manager_t
oken", "PUT", firstPullList},
+ req: RequestTester{"/pull", "invalid_data
ManagerT
oken", "PUT", firstPullList},
responseCode: http.StatusUnauthorized,
responseBody: "Unauthorized\n",
readContent: "hello",
responseCode: http.StatusUnauthorized,
responseBody: "Unauthorized\n",
readContent: "hello",