[ARVADOS] updated: afd38976a33c46b618ff9317192388b8f3f1a195

[git at public.curoverse.com]

Summary of changes:
 services/keepstore/pull_worker.go      |  8 +++++++-
 services/keepstore/pull_worker_test.go | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

       via  afd38976a33c46b618ff9317192388b8f3f1a195 (commit)
      from  cb9fbffa7f480dae5f17eb44f27d0b3523da0f0a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit afd38976a33c46b618ff9317192388b8f3f1a195
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Feb 27 14:27:15 2015 -0500

    3761: additional tests

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index 2342fd2..b68e933 100644
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -76,7 +76,7 @@ func Pull(addr string, locator string) (err error) {
 		return
 	}
 
-	err = PutBlock(read_content, locator)
+	err = PutContent(read_content, locator)
 	return
 }
 
@@ -116,3 +116,9 @@ func GenerateRandomApiToken() string {
 	}
 	return (string(bytes))
 }
+
+// Put block
+var PutContent = func(content []byte, locator string) (err error) {
+	err = PutBlock(content, locator)
+	return
+}
diff --git a/services/keepstore/pull_worker_test.go b/services/keepstore/pull_worker_test.go
index 907bfac..0bdb886 100644
--- a/services/keepstore/pull_worker_test.go
+++ b/services/keepstore/pull_worker_test.go
@@ -49,6 +49,7 @@ func TestPullWorker(t *testing.T) {
 		response_body string
 		read_content  string
 		read_error    bool
+		put_error     bool
 	}
 	var testcases = []PullWorkerTestData{
 		{
@@ -58,6 +59,7 @@ func TestPullWorker(t *testing.T) {
 			"Received 2 pull requests\n",
 			"hello",
 			false,
+			false,
 		},
 		{
 			"Pull request 2 from the data manager in worker",
@@ -66,6 +68,7 @@ func TestPullWorker(t *testing.T) {
 			"Received 1 pull requests\n",
 			"hola",
 			false,
+			false,
 		},
 		{
 			"Pull request with error on get",
@@ -74,6 +77,16 @@ func TestPullWorker(t *testing.T) {
 			"Received 1 pull requests\n",
 			"unused",
 			true,
+			false,
+		},
+		{
+			"Pull request with error on put",
+			RequestTester{"/pull", data_manager_token, "PUT", second_pull_list},
+			http.StatusOK,
+			"Received 1 pull requests\n",
+			"unused",
+			false,
+			true,
 		},
 	}
 
@@ -87,6 +100,15 @@ func TestPullWorker(t *testing.T) {
 			}
 		}
 
+		// Override PutContent to mock PutBlock functionality
+		PutContent = func(content []byte, locator string) (err error) {
+			if testData.put_error {
+				return errors.New("Error putting data")
+			} else {
+				return nil
+			}
+		}
+
 		response := IssueRequest(&testData.req)
 		ExpectStatusCode(t, testData.name, testData.response_code, response)
 		ExpectBody(t, testData.name, testData.response_body, response)

-----------------------------------------------------------------------


hooks/post-receive
--