[ARVADOS] updated: 0bb6625febf6838867e105e3e7f66a485b639c76
git at public.curoverse.com
git at public.curoverse.com
Tue Oct 27 19:49:21 EDT 2015
Summary of changes:
apps/workbench/app/assets/javascripts/add_group.js | 44 ++
apps/workbench/app/models/group.rb | 4 +
apps/workbench/app/models/keep_disk.rb | 2 +-
apps/workbench/app/models/keep_service.rb | 2 +-
apps/workbench/app/models/link.rb | 4 +
apps/workbench/app/models/node.rb | 2 +-
apps/workbench/app/models/user.rb | 4 +
apps/workbench/app/models/virtual_machine.rb | 7 +-
.../app/views/users/_add_group_modal.html.erb | 27 ++
.../workbench/app/views/users/_show_admin.html.erb | 9 +-
.../test/integration/application_layout_test.rb | 16 +-
apps/workbench/test/integration/errors_test.rb | 12 -
apps/workbench/test/integration/users_test.rb | 22 +
.../test/integration/virtual_machines_test.rb | 14 -
doc/_config.yml | 1 +
...onfigure-azure-blob-storage.html.textile.liquid | 62 +++
doc/install/install-keepstore.html.textile.liquid | 63 ++-
sdk/go/crunchrunner/crunchrunner.go | 356 +++++++++++++++++
sdk/go/crunchrunner/crunchrunner_test.go | 445 +++++++++++++++++++++
sdk/go/crunchrunner/upload.go | 217 ++++++++++
sdk/go/crunchrunner/upload_test.go | 140 +++++++
sdk/python/arvados/__init__.py | 65 ++-
sdk/python/tests/arvados_testutil.py | 4 +
sdk/python/tests/test_api.py | 86 ++--
sdk/python/tests/test_retry_job_helpers.py | 105 +++++
services/arv-git-httpd/git_handler_test.go | 6 +-
services/keepproxy/keepproxy_test.go | 41 +-
27 files changed, 1643 insertions(+), 117 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/add_group.js
create mode 100644 apps/workbench/app/views/users/_add_group_modal.html.erb
create mode 100644 doc/install/configure-azure-blob-storage.html.textile.liquid
create mode 100644 sdk/go/crunchrunner/crunchrunner.go
create mode 100644 sdk/go/crunchrunner/crunchrunner_test.go
create mode 100644 sdk/go/crunchrunner/upload.go
create mode 100644 sdk/go/crunchrunner/upload_test.go
create mode 100644 sdk/python/tests/test_retry_job_helpers.py
via 0bb6625febf6838867e105e3e7f66a485b639c76 (commit)
via c5db21f4d720e931ed7bff0c5da53caf0cafd2f4 (commit)
via 61c91fe02574ad751c2c957f6ca0d2e1e21105f9 (commit)
via 38f28f90703cce64f124e26d8f61e10073505b2d (commit)
via a88b81005608f38bb269693d961f29bad5a9eb35 (commit)
via 2c149e2e0a4d00831f111aedaaf47320100c3a00 (commit)
via f4bc86376bd9f0f4cd10aad9296763a089cecd2a (commit)
via 9290961beb18476f71aa0ae12478fe50493e8ad9 (commit)
via bea3b865873ab4769d9786137037680a8f280560 (commit)
via 49645de7263ac010f25af3d79e177c4962e59578 (commit)
via 50484a71693dd3458b8d2323a8c4e118f37121a9 (commit)
via 2b43b263f8cd5cbd931d884bfa961a7dba7a4b9a (commit)
via ef11ca4b86beb111acb6a99d4eadbc7b0a0d27ef (commit)
via 9379a6ccce1d9787ced772e82732f1d5de8bc756 (commit)
via d0f91b34eedec9af266ec4877a3005dd627ad38e (commit)
via 5b743caf9a5913c62ec1f525f4e95d1c31f76233 (commit)
via 6e0145efb9929b5a854fb3461161460b0ac75fba (commit)
via 5c478bbd77d326e06a44729792b433764fb39b02 (commit)
via a93b0bd7195895129411789f0db00a62d8c7336f (commit)
via 916172f535ee28f608433d536a9ef7eb2d70df39 (commit)
via cf36ef35f234d1b35bb4212345f7cfc4d6e47578 (commit)
via 0fa7cd5bfdab924f316046f923aec282b699d8a1 (commit)
via 4e98b0adbda5d6525825e72f67d9542c47147d0a (commit)
via 5d3de212473f9fbf0e797c1fc03ec1dbf8f532ef (commit)
via 53b1b5bbe6d6ae007e8ce546ba2539e0c061e25a (commit)
via 0d428c09204f37f9c276c31e54bdb7acc5c80c02 (commit)
via 5fb633ee021c613d99280e8958a6598602041011 (commit)
via 30bfda443a98efc1a717f35258e3c3ffd7369d7c (commit)
via 7600537f3f34ee88a76688dbb0e1d73723905fa7 (commit)
via 5a4cb9d3957905a02716761edb1be662edad0312 (commit)
via f15a9a1ad40f589d3c40f856a95e1d5556ee7ca1 (commit)
via 4c2855c80c11b60be9e5c6af384a0a90fb66ae16 (commit)
via 1c4ba204361de15430236b84b10c9ac5c68665ae (commit)
from 3e4f591181a38d739d94cf9321f874c19937d199 (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 0bb6625febf6838867e105e3e7f66a485b639c76
Author: radhika <radhika at curoverse.com>
Date: Tue Oct 27 19:48:47 2015 -0400
7492: add a test that simulates keep server unavailable error.
diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 6303122..997163e 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -30,6 +30,12 @@ var _ = Suite(&ServerRequiredSuite{})
// Tests that require the Keep server running
type ServerRequiredSuite struct{}
+// Gocheck boilerplate
+var _ = Suite(&NoKeepServerSuite{})
+
+// Test with no keepserver to simulate errors
+type NoKeepServerSuite struct{}
+
// Wait (up to 1 second) for keepproxy to listen on a port. This
// avoids a race condition where we hit a "connection refused" error
// because we start testing the proxy too soon.
@@ -65,6 +71,18 @@ func (s *ServerRequiredSuite) TearDownSuite(c *C) {
arvadostest.StopAPI()
}
+func (s *NoKeepServerSuite) SetUpSuite(c *C) {
+ arvadostest.StartAPI()
+}
+
+func (s *NoKeepServerSuite) SetUpTest(c *C) {
+ arvadostest.ResetEnv()
+}
+
+func (s *NoKeepServerSuite) TearDownSuite(c *C) {
+ arvadostest.StopAPI()
+}
+
func setupProxyService() {
client := &http.Client{Transport: &http.Transport{
@@ -519,7 +537,7 @@ func (s *ServerRequiredSuite) TestPutAskGetInvalidToken(c *C) {
}
}
-func (s *ServerRequiredSuite) TestPutAskGetConnectionError(c *C) {
+func (s *ServerRequiredSuite) TestAskGetKeepProxyConnectionError(c *C) {
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, Equals, nil)
@@ -545,3 +563,24 @@ func (s *ServerRequiredSuite) TestPutAskGetConnectionError(c *C) {
c.Check(errNotFound.Temporary(), Equals, true)
c.Assert(strings.Contains(err.Error(), "connection refused"), Equals, true)
}
+
+func (s *NoKeepServerSuite) TestAskGetNoKeepServerError(c *C) {
+ kc := runProxy(c, []string{"keepproxy"}, 29999, false)
+ waitForListener()
+ defer closeListener()
+
+ // Ask should result in temporary connection refused error
+ hash := fmt.Sprintf("%x", md5.Sum([]byte("foo")))
+ _, _, err := kc.Ask(hash)
+ c.Check(err, NotNil)
+ errNotFound, _ := err.(*keepclient.ErrNotFound)
+ c.Check(errNotFound.Temporary(), Equals, true)
+ c.Assert(strings.Contains(err.Error(), "HTTP 502"), Equals, true)
+
+ // Get should result in temporary connection refused error
+ _, _, _, err = kc.Get(hash)
+ c.Check(err, NotNil)
+ errNotFound, _ = err.(*keepclient.ErrNotFound)
+ c.Check(errNotFound.Temporary(), Equals, true)
+ c.Assert(strings.Contains(err.Error(), "HTTP 502"), Equals, true)
+}
commit c5db21f4d720e931ed7bff0c5da53caf0cafd2f4
Merge: 2c149e2 61c91fe
Author: radhika <radhika at curoverse.com>
Date: Tue Oct 27 18:39:12 2015 -0400
Merge branch 'master' into 7492-keepproxy-upstream-errors
commit 2c149e2e0a4d00831f111aedaaf47320100c3a00
Merge: 3e4f591 f4bc863
Author: radhika <radhika at curoverse.com>
Date: Tue Oct 27 14:11:13 2015 -0400
Merge branch 'master' into 7492-keepproxy-upstream-errors
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list