[ARVADOS] updated: 1.2.0-45-g3ae5b174a
Git user
git at public.curoverse.com
Tue Aug 21 13:18:38 EDT 2018
Summary of changes:
apps/workbench/app/helpers/application_helper.rb | 12 +---
.../application/_show_text_with_locators.html.erb | 49 ++++++++------
.../container_requests_controller_test.rb | 2 +
doc/api/methods/groups.html.textile.liquid | 21 ++++++
.../api/app/controllers/application_controller.rb | 4 ++
.../controllers/arvados/v1/groups_controller.rb | 56 ++++++++++++++++
services/api/app/models/container_request.rb | 38 +++++++++++
services/api/config/routes.rb | 1 +
...30357_add_pdh_and_trash_index_to_collections.rb | 9 +++
...80820135808_drop_pdh_index_from_collections.rb} | 4 +-
services/api/db/structure.sql | 8 ++-
.../test/fixtures/api_client_authorizations.yml | 7 ++
services/api/test/fixtures/container_requests.yml | 2 +-
services/api/test/fixtures/containers.yml | 2 +-
services/api/test/fixtures/groups.yml | 8 +++
.../v1/container_requests_controller_test.rb | 6 +-
.../arvados/v1/groups_controller_test.rb | 57 +++++++++++++++++
services/api/test/unit/container_request_test.rb | 30 +++++----
services/api/test/unit/container_test.rb | 8 +--
.../crunch-dispatch-local_test.go | 10 +--
services/fuse/arvados_fuse/fusedir.py | 74 ++++++++++++++--------
services/keep-web/handler.go | 7 +-
services/keep-web/handler_test.go | 2 +-
23 files changed, 329 insertions(+), 88 deletions(-)
create mode 100644 services/api/db/migrate/20180820130357_add_pdh_and_trash_index_to_collections.rb
copy services/api/db/migrate/{20130107181109_add_uuid_to_collections.rb => 20180820135808_drop_pdh_index_from_collections.rb} (50%)
via 3ae5b174a710fca21895a1ad7273b6f61bf9ac1e (commit)
via 35bc168c5a98dbe3b97c4b3179b4834b78a5b72c (commit)
via 067a7263a97e1b4d96ee6572e79884bdcd937bbf (commit)
via 0d93140ca76f38f05f1b689bdf31168efbc6984f (commit)
via 5c1d46ab958097eb0da1ca692af23345e1faf66c (commit)
via 22488d2c44b03bd255a9d223b8f8498d56534bdf (commit)
via b7d199af0a1844a4b6db38d315c26365617bfe41 (commit)
via a0446e23b6795c8c90c5e66438a3a1bb82f9368a (commit)
via 662a70957f0652acd6579efc635eed8f708ab48c (commit)
via 1a373b5f2c37cead0fe41482805fdb93ca871e37 (commit)
via 6d6a0b0f7d5780c92c865ba2e6979195510c27b2 (commit)
via 489aed58cb0d8bd816e07128cfcb9f5a06224083 (commit)
via 24972a99eb2cb4d914b687ccd4050f2da0333214 (commit)
via 99263be28ab2ec28db721ced52357c05d11947d7 (commit)
via a41c0f6aa41b658c8f2947c46cb90778894f5cf3 (commit)
via 5d9908601b8c16c556d0153640f67aa3b26c2f57 (commit)
via 89698c15b13dcb151ebb673a2d73b1df7339c607 (commit)
via eb1c9afa9a92c1506e5d4d1161b6e74d919e8f00 (commit)
via f0d67ab6f71cef3e7ce0fa850f7309a94e21671b (commit)
via 9c93e1f79c385269435299d90d00e1b36c09cf3c (commit)
via 0ba8a53ba145475153b01dc498f85dbd2f03228b (commit)
via bb31e272ab27d14a5d7dce7e4270c10b99035f45 (commit)
via 61ad64acbca1b8cc990ecf0e9ca2c54ad9eb8fe6 (commit)
via 4d00ed0a34cae5a5da3992ca9adac46d3682fee1 (commit)
via bc49a7967325c523a7c25d48df30ae718a66aa63 (commit)
via 0befd8da0101dbc7845c8216637c8b621519bc68 (commit)
from f739d736bbb60a8463f04f5d56c18d09157d820e (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 3ae5b174a710fca21895a1ad7273b6f61bf9ac1e
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Tue Aug 21 13:18:26 2018 -0400
13959: Fix test regexps.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/services/crunch-dispatch-local/crunch-dispatch-local_test.go b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
index c780c6bf2..6da17ea86 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@ -12,7 +12,7 @@ import (
"net/http/httptest"
"os"
"os/exec"
- "strings"
+ "regexp"
"testing"
"time"
@@ -41,6 +41,7 @@ func (s *TestSuite) SetUpSuite(c *C) {
initialArgs = os.Args
arvadostest.StartAPI()
runningCmds = make(map[string]*exec.Cmd)
+ logrus.SetFormatter(&logrus.TextFormatter{DisableColors: true})
}
func (s *TestSuite) TearDownSuite(c *C) {
@@ -133,7 +134,7 @@ func (s *MockArvadosServerSuite) Test_ContainerStillInRunningAfterRun(c *C) {
arvadostest.StubResponse{200, string(`{"uuid":"zzzzz-dz642-xxxxxxxxxxxxxx2", "state":"Running", "priority":1, "locked_by_uuid": "` + arvadostest.Dispatch1AuthUUID + `"}`)}
testWithServerStub(c, apiStubResponses, "echo",
- `after "echo" process termination, container state for zzzzz-dz642-xxxxxxxxxxxxxx2 is "Running"; updating it to "Cancelled"`)
+ `after \\"echo\\" process termination, container state for zzzzz-dz642-xxxxxxxxxxxxxx2 is \\"Running\\"; updating it to \\"Cancelled\\"`)
}
func (s *MockArvadosServerSuite) Test_ErrorRunningContainer(c *C) {
@@ -144,7 +145,7 @@ func (s *MockArvadosServerSuite) Test_ErrorRunningContainer(c *C) {
apiStubResponses["/arvados/v1/containers/zzzzz-dz642-xxxxxxxxxxxxxx3/lock"] =
arvadostest.StubResponse{200, string(`{"uuid":"zzzzz-dz642-xxxxxxxxxxxxxx3", "state":"Locked", "priority":1}`)}
- testWithServerStub(c, apiStubResponses, "nosuchcommand", `error starting "nosuchcommand" for zzzzz-dz642-xxxxxxxxxxxxxx3`)
+ testWithServerStub(c, apiStubResponses, "nosuchcommand", `error starting \\"nosuchcommand\\" for zzzzz-dz642-xxxxxxxxxxxxxx3`)
}
func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubResponse, crunchCmd string, expected string) {
@@ -186,8 +187,9 @@ func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon
return cmd.Start()
}
+ re := regexp.MustCompile(`(?ms).*` + expected + `.*`)
go func() {
- for i := 0; i < 80 && !strings.Contains(buf.String(), expected); i++ {
+ for i := 0; i < 80 && !re.MatchString(buf.String()); i++ {
time.Sleep(100 * time.Millisecond)
}
cancel()
commit 35bc168c5a98dbe3b97c4b3179b4834b78a5b72c
Merge: f739d736b 067a7263a
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Tue Aug 21 12:51:22 2018 -0400
13959: Merge branch 'master' into 13959-timeouts-and-logging
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list