[ARVADOS] updated: 6a983720b3d1ee8e613bf3902e69fd14f505b995

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/angular_shim.js         |  2 +-
 .../app/assets/javascripts/report_issue.js         | 13 ++---
 apps/workbench/app/assets/javascripts/tab_panes.js |  4 +-
 .../app/assets/javascripts/upload_to_collection.js | 18 ++++++-
 .../app/controllers/application_controller.rb      | 39 ++++++++-------
 .../views/application/_report_issue_popup.html.erb |  2 +-
 .../workbench/test/integration/ajax_errors_test.rb | 56 ++++++++++++++++++++++
 .../test/integration/collection_upload_test.rb     | 37 ++++++++++++++
 apps/workbench/test/integration/errors_test.rb     | 38 +++++++--------
 .../test/integration/report_issue_test.rb          |  5 ++
 apps/workbench/test/test_helper.rb                 | 31 ++++++++++++
 .../workbench/test/unit/arvados_api_client_test.rb | 23 +++++++++
 doc/_config.yml                                    |  2 +-
 doc/install/index.html.textile.liquid              | 25 +++-------
 doc/install/install-api-server.html.textile.liquid |  6 +--
 doc/install/install-docker.html.textile.liquid     |  5 +-
 doc/install/install-keepproxy.html.textile.liquid  | 15 ++++++
 .../install-manual-overview.html.textile.liquid    | 15 +++---
 ...l-manual-prerequisites-ruby.html.textile.liquid |  8 ++--
 doc/install/pre-built-docker.html.textile.liquid   | 32 +++++++++++++
 services/keepstore/pull_worker_test.go             | 32 +++++++++++--
 21 files changed, 317 insertions(+), 91 deletions(-)
 create mode 100644 apps/workbench/test/integration/ajax_errors_test.rb
 create mode 100644 apps/workbench/test/unit/arvados_api_client_test.rb
 create mode 100644 doc/install/pre-built-docker.html.textile.liquid

       via  6a983720b3d1ee8e613bf3902e69fd14f505b995 (commit)
       via  a37e37c96f0de3939a8c2d873df5f3103589fc48 (commit)
       via  855a790d7be3ff345f04226bde3719fb90e6d9a5 (commit)
       via  07618b6828e179f39df2918f4f8a2d8f59d2c6d9 (commit)
       via  ebbe2d754223e788ef7c532fb5d1613a51f754a6 (commit)
       via  fc79e9d9109f84dd1c9851fd231d7d333914b54e (commit)
       via  2d0dd74fb0446f8cda195147d45a6ab4ca0e2431 (commit)
       via  5fba915ccda49de6d4554b4e6088c0444b39cee6 (commit)
       via  56907cb993bce1287242c379bdfd48e329aa307d (commit)
       via  bc25cf11db28299cfb3cce8d51e253c4d7b6b7c1 (commit)
       via  fed95824264369e705b9f148f857295644dae138 (commit)
       via  572a74976c1d2d341265c1377a60222215079c62 (commit)
       via  8c473f086b705d55132286cd2a276bcf67a15558 (commit)
       via  4d71b77be419a60d8dd64d16ebeb4b83be5cb97d (commit)
       via  6058d8a2af0a7461f9a412b1b69948e4d0e9224f (commit)
       via  db1542b94b228e92e9b5bd82ad93ef83239a2768 (commit)
       via  797d78f4e7bc7807d42366054d6d49b4a550d8b9 (commit)
       via  d554f6e4b85728181946a016e08ae00f16c46c90 (commit)
       via  630b52566620e906c2037bc498cdd36b93240bd6 (commit)
       via  470e9c16d9c8713e4b0ba614ed5216ff1b47defa (commit)
       via  878b0ff6d405dfcd4f3277ff7d9382af29db6c32 (commit)
       via  4e98958d0eed70a8287d3e72d5256de483dbe721 (commit)
      from  ede1e36731d834142200a99501f9ca948c6a3b36 (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 6a983720b3d1ee8e613bf3902e69fd14f505b995
Merge: a37e37c 855a790
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Mar 11 09:32:21 2015 -0400

    Merge branch 'master' into 3761-pull-list-worker


commit a37e37c96f0de3939a8c2d873df5f3103589fc48
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Mar 11 09:31:44 2015 -0400

    3761: add a test with invalid data manager token and expect the item to be rejected.

diff --git a/services/keepstore/pull_worker_test.go b/services/keepstore/pull_worker_test.go
index dc6d462..f0e9e65 100644
--- a/services/keepstore/pull_worker_test.go
+++ b/services/keepstore/pull_worker_test.go
@@ -218,6 +218,25 @@ func (s *PullWorkerTestSuite) TestPullWorker_pull_list_with_two_items_latest_rep
 	performTest(testData, c)
 }
 
+// In this case, the item will not be placed on pullq
+func (s *PullWorkerTestSuite) TestPullWorker_invalid_data_manager_token(c *C) {
+	defer teardown()
+
+	data_manager_token = "DATA MANAGER TOKEN"
+
+	testData := PullWorkerTestData{
+		name:          "TestPullWorker_pull_list_with_two_locators",
+		req:           RequestTester{"/pull", "invalid_data_manager_token", "PUT", first_pull_list},
+		response_code: http.StatusUnauthorized,
+		response_body: "Unauthorized\n",
+		read_content:  "hello",
+		read_error:    false,
+		put_error:     false,
+	}
+
+	performTest(testData, c)
+}
+
 func performTest(testData PullWorkerTestData, c *C) {
 	RunTestPullWorker(c)
 
@@ -269,14 +288,19 @@ func performTest(testData PullWorkerTestData, c *C) {
 		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.response_code == http.StatusOK {
+			c.Assert(len(testPullLists), Equals, 1)
+			c.Assert(len(processedPullLists), Equals, 1)
+			c.Assert(testPullLists[testData.name], NotNil)
+		} else {
+			c.Assert(len(testPullLists), Equals, 1)
+			c.Assert(len(processedPullLists), Equals, 0)
+		}
 	}
 
 	if testData.read_error {
 		c.Assert(readError, NotNil)
-	} else {
+	} else if testData.response_code == http.StatusOK {
 		c.Assert(readError, IsNil)
 		c.Assert(readContent, Equals, testData.read_content)
 		if testData.put_error {

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


hooks/post-receive
--