[ARVADOS] updated: da68b65f0264961902d0a26aea42466a69523148
git at public.curoverse.com
git at public.curoverse.com
Thu Nov 12 13:04:39 EST 2015
Summary of changes:
.../app/controllers/collections_controller.rb | 86 ++++++++-
apps/workbench/config/application.default.yml | 29 +++
.../controllers/collections_controller_test.rb | 129 ++++++++++++-
apps/workbench/test/helpers/download_helper.rb | 21 +++
.../test/integration/collection_upload_test.rb | 42 +++--
apps/workbench/test/integration/download_test.rb | 51 +++++
apps/workbench/test/integration_helper.rb | 16 +-
apps/workbench/test/test_helper.rb | 5 +
doc/install/install-keep-web.html.textile.liquid | 42 +++--
sdk/cli/bin/arv-run-pipeline-instance | 33 ++--
sdk/cli/bin/crunch-job | 2 +-
sdk/go/arvadosclient/arvadosclient.go | 100 +++++++---
sdk/go/arvadosclient/arvadosclient_test.go | 166 ++++++++++++++++
sdk/go/arvadostest/run_servers.go | 62 +++---
sdk/go/keepclient/discover.go | 130 +++++++++++++
sdk/go/keepclient/discover_test.go | 21 +++
sdk/go/keepclient/support.go | 81 --------
sdk/python/tests/nginx.conf | 14 ++
sdk/python/tests/run_test_server.py | 182 +++++++++++++-----
.../api/app/controllers/database_controller.rb | 4 +
.../test/fixtures/api_client_authorizations.yml | 2 +-
services/datamanager/keep/keep_test.go | 22 ++-
services/fuse/arvados_fuse/fusedir.py | 7 +-
services/fuse/bin/arv-mount | 9 +-
services/fuse/tests/test_mount.py | 63 +++++++
services/keep-web/handler.go | 68 ++++++-
services/keep-web/handler_test.go | 103 ++++++++--
services/keepproxy/keepproxy.go | 48 +----
services/keepproxy/keepproxy_test.go | 209 ++++++---------------
services/keepstore/pull_worker_integration_test.go | 4 +
tools/keep-rsync/keep-rsync_test.go | 6 +-
31 files changed, 1275 insertions(+), 482 deletions(-)
create mode 100644 apps/workbench/test/helpers/download_helper.rb
create mode 100644 apps/workbench/test/integration/download_test.rb
create mode 100644 sdk/go/keepclient/discover.go
create mode 100644 sdk/go/keepclient/discover_test.go
via da68b65f0264961902d0a26aea42466a69523148 (commit)
via dfb9a5e285e4275c26b6f959a04babd5a8ad836e (commit)
via 1e2ace543b5614023e30f77d85c19da954cbf1cb (commit)
via 206451cdcaee133836761024c8517629de429f10 (commit)
via 192e5a9d12fb9fd16baff2b61af011611b671983 (commit)
via 3cdc4e8e3668b783f42f887f6a8662b66ecb7f9a (commit)
via f5dda9d0b27a65918d53909c265c42f4da2f83e1 (commit)
via 51169558811743fcd2e21e4b9397f9fb2d4766b0 (commit)
via 768f114b1746dddec0f0224dee92a58c8ddc5499 (commit)
via 9aef039747f280914873b17f8c5b64a44c42fd0a (commit)
via 9b91a7c2e783595b168a5aa101b4313f9dcce65e (commit)
via b1781295959566608326b69440d8d3ae8e4da4ee (commit)
via 898c73ef5179e3c0cdc088ca369500b40df23b89 (commit)
via fe7b78b41bb12070559ebb693c21df18f65f0c99 (commit)
via f8fdd0cbdf1de1464bc1fc7cc5e7660205edf56b (commit)
via 7fae6271dd3b05db5a7f084cf686f7388e2822db (commit)
via 1e427ad73a413642bfe35d7865f8b03b8564c1da (commit)
via b958fc62a440d30e4f381f88015acfecaa640b71 (commit)
via b5c48c07a2618740eab353150a450fb62bb4ceee (commit)
via 142953f3b9f4a7da5bd456c3e0c6ee93d0f54055 (commit)
via 5d74e7583ad4b2d5dfd9eec50d625eded3739d1c (commit)
via c1d63408c611a5ce65dc4de41aeb323c06da2bbc (commit)
via ddeed20d869b0d4a8dcd3c763b5dee7158f912ad (commit)
via 9bc0194676e3f22b41976fefc6146d7dd965d173 (commit)
via 4c00b4c7c670abe7da5c61e437887a53bbcaadf9 (commit)
via a41db1e1945408d33e0b7905e63d2ae9164b1c49 (commit)
via 05a38f1bd00d572cbfd67d7276f5bcae6bb24805 (commit)
via a4ed403c77477b7cc869c5fdd801ac839e941b9c (commit)
via 9d2a99db8f9b1259d94f650c550d2101e5d915d5 (commit)
via a7b140ac8c00ca5f9dfb1f3a46c78dd7b9a68730 (commit)
via b86c7d168ce73f830f01d204189ed0941bf8e469 (commit)
via 6fab045dba4714e9c748337ef974ef257df37353 (commit)
via a3dfcea5c3767936aa7bff6e03268d4ecadd0489 (commit)
via 1e10339657c1dee2b71b4d10eddffd0a35c949b3 (commit)
via 4517ed5d2c28870422faf8057d4f6708242cc5a0 (commit)
via 3ded4c192b1fc655d9fffa225f792055f10f78c9 (commit)
via f9577d8ec75fdf861c7dd69ed8cbbc6c3f445669 (commit)
via 100b485f4295cbb414ed743b2fdba990591272e7 (commit)
via 745cfb876277f0c65244d570c1736fb936446f35 (commit)
via b1ef43a1dbb4a66e1646fc68ac88ff6d54026ac1 (commit)
via db68fd029f681f380f218b9b2f4fec3a315f140c (commit)
via 27b9247e0c42700e0c7d94f7721e2164610b1e4c (commit)
via 4288cc1b9f894d3574be1ac04dab01e70e1a4580 (commit)
via ffdfd0ac6e501514c5327c2d6b5f8507bb6353bc (commit)
via 4197567e7b1fe768896ea6af9c4160b43e8521dd (commit)
via 579f6139c9c03fe1b08993746c87aa525ff314e9 (commit)
via cabef98fc6cec3b9616d0c76ba469184b9dce693 (commit)
via c6ec580a9c79d1d21cffa6454d871538ba7c14f0 (commit)
via 4862071616a002ac4873147ea07109629206584a (commit)
via 767e1199d0e1bdf2b564b5c58a91d29141eb67d7 (commit)
via 64027668d7b5bd47a863c86277c83961d8a29914 (commit)
via ce2bf31ba0831d9704f2edf82297f701b3b994df (commit)
via ecc0d50421458b1ccd175b4e1e9fc539a98088ed (commit)
via 6fbf2a60cf4a41156cf97c98e36ff54ec76f8401 (commit)
via a4acb3ae95b2fc7f4b5f1e174c910a54cc6681da (commit)
via 0f535af4fbcb7a9f6ca1e25675b31cc9656d88f3 (commit)
via 813d35123538b00ab70719e247b6bb0881269460 (commit)
via de1aef9bd3cd982604b1f9f1ad8433d0b28112ee (commit)
via 0795b298257f0441f94993999e1dc718a1f64bbd (commit)
via 9bc64c76164e6b11cbbfd0bdb86483243bb08306 (commit)
via bf159738719badbbe1e08ee4f839027892912ab2 (commit)
from c79792f08d8faf712f70c67ed1216feabc5d9408 (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 da68b65f0264961902d0a26aea42466a69523148
Author: radhika <radhika at curoverse.com>
Date: Thu Nov 12 13:03:10 2015 -0500
7490: Update the previously failing keep_test.go; no new tests added. We can now add datamanager/keep to gostuff in run-tests.sh
diff --git a/services/datamanager/keep/keep_test.go b/services/datamanager/keep/keep_test.go
index 2ccf17d..272fad2 100644
--- a/services/datamanager/keep/keep_test.go
+++ b/services/datamanager/keep/keep_test.go
@@ -2,11 +2,14 @@ package keep
import (
"encoding/json"
- "git.curoverse.com/arvados.git/sdk/go/keepclient"
- . "gopkg.in/check.v1"
"net/http"
"net/http/httptest"
"testing"
+
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/keepclient"
+
+ . "gopkg.in/check.v1"
)
// Gocheck boilerplate
@@ -30,16 +33,18 @@ func (ts *TestHandler) ServeHTTP(writer http.ResponseWriter, req *http.Request)
func (s *KeepSuite) TestSendTrashLists(c *C) {
th := TestHandler{}
server := httptest.NewServer(&th)
+ defer server.Close()
tl := map[string]TrashList{
server.URL: TrashList{TrashRequest{"000000000000000000000000deadbeef", 99}}}
- kc := keepclient.KeepClient{Client: &http.Client{}}
+ arv := arvadosclient.ArvadosClient{ApiToken: "abc123"}
+ kc := keepclient.KeepClient{Arvados: &arv, Client: &http.Client{}}
kc.SetServiceRoots(map[string]string{"xxxx": server.URL},
map[string]string{"xxxx": server.URL},
map[string]string{})
- err := SendTrashLists("", &kc, tl)
+ err := SendTrashLists(&kc, tl)
server.Close()
c.Check(err, IsNil)
@@ -61,19 +66,22 @@ func sendTrashListError(c *C, server *httptest.Server) {
tl := map[string]TrashList{
server.URL: TrashList{TrashRequest{"000000000000000000000000deadbeef", 99}}}
- kc := keepclient.KeepClient{Client: &http.Client{}}
+ arv := arvadosclient.ArvadosClient{ApiToken: "abc123"}
+ kc := keepclient.KeepClient{Arvados: &arv, Client: &http.Client{}}
kc.SetServiceRoots(map[string]string{"xxxx": server.URL},
map[string]string{"xxxx": server.URL},
map[string]string{})
- err := SendTrashLists("", &kc, tl)
+ err := SendTrashLists(&kc, tl)
c.Check(err, NotNil)
c.Check(err[0], NotNil)
}
func (s *KeepSuite) TestSendTrashListErrorResponse(c *C) {
- sendTrashListError(c, httptest.NewServer(&TestHandlerError{}))
+ server := httptest.NewServer(&TestHandlerError{})
+ sendTrashListError(c, server)
+ defer server.Close()
}
func (s *KeepSuite) TestSendTrashListUnreachable(c *C) {
commit dfb9a5e285e4275c26b6f959a04babd5a8ad836e
Merge: 192e5a9 1e2ace5
Author: radhika <radhika at curoverse.com>
Date: Wed Nov 11 12:34:04 2015 -0500
Merge branch 'master' into 7490-datamanager-dont-die-return-error
commit 192e5a9d12fb9fd16baff2b61af011611b671983
Merge: 142953f 3cdc4e8
Author: radhika <radhika at curoverse.com>
Date: Wed Nov 11 11:36:10 2015 -0500
Merge branch 'master' into 7490-datamanager-dont-die-return-error
commit 142953f3b9f4a7da5bd456c3e0c6ee93d0f54055
Merge: c79792f 5d74e75
Author: radhika <radhika at curoverse.com>
Date: Mon Nov 9 13:54:56 2015 -0500
Merge branch 'master' into 7490-datamanager-dont-die-return-error
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list