3761: Working!!!!

[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 8c99a14227e3d713c67d2cb7f0297ae91daaee6e..dc6d46276682feb3fc4088a1010ef498bdd627d8 100644 (file)
--- a/services/keepstore/pull_worker_test.go
+++ b/services/keepstore/pull_worker_test.go
@@ -29,8 +29,6 @@ var putContent []byte
 var putError error
 var currentTestData PullWorkerTestData
 
-const READ_CONTENT = "Hi!"
-
 func (s *PullWorkerTestSuite) SetUpTest(c *C) {
        readContent = ""
        readError = nil
@@ -38,36 +36,12 @@ func (s *PullWorkerTestSuite) SetUpTest(c *C) {
        putError = nil
 
        // When a new pull request arrives, the old one will be overwritten.
-       // This behavior is verified using these maps in the "TestPullWorker_pull_list_with_two_items_latest_replacing_old"
+       // This behavior is verified using these two maps in the
+       // "TestPullWorker_pull_list_with_two_items_latest_replacing_old"
        testPullLists = make(map[string]string)
        processedPullLists = make(map[string]string)
 }
 
-func (s *PullWorkerTestSuite) TearDownTest(c *C) {
-       expectWorkerChannelEmpty(c, pullq.NextItem)
-
-       if currentTestData.name == "TestPullWorker_pull_list_with_two_items_latest_replacing_old" {
-               c.Assert(len(testPullLists), Equals, 2)
-               c.Assert(len(processedPullLists), Equals, 1)
-               c.Assert(testPullLists["Added_before_actual_test_item"], NotNil)
-               c.Assert(testPullLists["TestPullWorker_pull_list_with_two_items_latest_replacing_old"], NotNil)
-               c.Assert(processedPullLists["TestPullWorker_pull_list_with_two_items_latest_replacing_old"], NotNil)
-       }
-
-       if currentTestData.read_error {
-               c.Assert(readError, NotNil)
-       } else {
-               c.Assert(readError, IsNil)
-               c.Assert(readContent, Equals, READ_CONTENT)
-               if currentTestData.put_error {
-                       c.Assert(putError, NotNil)
-               } else {
-                       c.Assert(putError, IsNil)
-                       c.Assert(string(putContent), Equals, READ_CONTENT)
-               }
-       }
-}
-
 // Since keepstore does not come into picture in tests,
 // we need to explicitly start the goroutine in tests.
 func RunTestPullWorker(c *C) {
@@ -193,7 +167,7 @@ func (s *PullWorkerTestSuite) TestPullWorker_error_on_put_one_locator(c *C) {
                req:           RequestTester{"/pull", data_manager_token, "PUT", second_pull_list},
                response_code: http.StatusOK,
                response_body: "Received 1 pull requests\n",
-               read_content:  "unused",
+               read_content:  "hello hello",
                read_error:    false,
                put_error:     true,
        }
@@ -210,7 +184,7 @@ func (s *PullWorkerTestSuite) TestPullWorker_error_on_put_two_locators(c *C) {
                req:           RequestTester{"/pull", data_manager_token, "PUT", first_pull_list},
                response_code: http.StatusOK,
                response_body: "Received 2 pull requests\n",
-               read_content:  "unused",
+               read_content:  "hello again",
                read_error:    false,
                put_error:     true,
        }
@@ -236,7 +210,7 @@ func (s *PullWorkerTestSuite) TestPullWorker_pull_list_with_two_items_latest_rep
                req:           RequestTester{"/pull", data_manager_token, "PUT", second_pull_list},
                response_code: http.StatusOK,
                response_body: "Received 1 pull requests\n",
-               read_content:  "hola",
+               read_content:  "hola de nuevo",
                read_error:    false,
                put_error:     false,
        }
@@ -260,11 +234,11 @@ func performTest(testData PullWorkerTestData, c *C) {
                        readError = err
                        return nil, 0, "", err
                } else {
-                       readContent = READ_CONTENT
-                       cb := &ClosingBuffer{bytes.NewBufferString(readContent)}
+                       readContent = testData.read_content
+                       cb := &ClosingBuffer{bytes.NewBufferString(testData.read_content)}
                        var rc io.ReadCloser
                        rc = cb
-                       return rc, int64(len(READ_CONTENT)), "", nil
+                       return rc, int64(len(testData.read_content)), "", nil
                }
        }
 
@@ -283,6 +257,35 @@ func performTest(testData PullWorkerTestData, c *C) {
        response := IssueRequest(&testData.req)
        c.Assert(testData.response_code, Equals, response.Code)
        c.Assert(testData.response_body, Equals, response.Body.String())
+
+       expectWorkerChannelEmpty(c, pullq.NextItem)
+
+       pullq.Close()
+
+       if testData.name == "TestPullWorker_pull_list_with_two_items_latest_replacing_old" {
+               c.Assert(len(testPullLists), Equals, 2)
+               c.Assert(len(processedPullLists), Equals, 1)
+               c.Assert(testPullLists["Added_before_actual_test_item"], NotNil)
+               c.Assert(testPullLists["TestPullWorker_pull_list_with_two_items_latest_replacing_old"], NotNil)
+               c.Assert(processedPullLists["TestPullWorker_pull_list_with_two_items_latest_replacing_old"], NotNil)
+       } else {
+               c.Assert(len(testPullLists), Equals, 1)
+               c.Assert(len(processedPullLists), Equals, 1)
+               c.Assert(testPullLists[testData.name], NotNil)
+       }
+
+       if testData.read_error {
+               c.Assert(readError, NotNil)
+       } else {
+               c.Assert(readError, IsNil)
+               c.Assert(readContent, Equals, testData.read_content)
+               if testData.put_error {
+                       c.Assert(putError, NotNil)
+               } else {
+                       c.Assert(putError, IsNil)
+                       c.Assert(string(putContent), Equals, testData.read_content)
+               }
+       }
 }
 
 type ClosingBuffer struct {