[ARVADOS] updated: 1.1.2-259-g8ca0b14
Git user
git at public.curoverse.com
Fri Feb 2 09:45:53 EST 2018
Summary of changes:
.../controllers/container_requests_controller.rb | 11 ++
apps/workbench/app/models/container_work_unit.rb | 36 +++-
.../container_requests/_show_recent_rows.html.erb | 2 +-
.../app/views/projects/_show_dashboard.html.erb | 15 +-
.../container_requests_controller_test.rb | 16 +-
apps/workbench/test/unit/work_unit_test.rb | 2 +-
sdk/R/R/Arvados.R | 22 ++-
sdk/R/R/HttpRequest.R | 5 +-
sdk/R/R/RESTService.R | 66 ++++---
sdk/R/README | 10 ++
sdk/R/tests/testthat/fakes/FakeHttpRequest.R | 2 +-
sdk/R/tests/testthat/test-RESTService.R | 189 ++++++++++++---------
sdk/cwl/arvados_cwl/__init__.py | 2 +-
sdk/cwl/arvados_cwl/pathmapper.py | 7 +-
sdk/cwl/tests/test_make_output.py | 2 +
services/api/app/models/container.rb | 24 ++-
services/api/app/models/container_request.rb | 13 +-
services/api/test/fixtures/container_requests.yml | 4 +-
services/api/test/unit/container_test.rb | 4 +-
services/crunch-run/crunchrun.go | 67 +++++---
services/crunch-run/crunchrun_test.go | 58 ++++---
21 files changed, 359 insertions(+), 198 deletions(-)
via 8ca0b1449607ded51e908481cc4660c20f43a777 (commit)
via bf97bb37d38df9d6edd1a6b0c4227ee9846a4905 (commit)
via b3e8a483835334becbef9cba2bebbcf08df47c15 (commit)
via 5f6738f134e1abb359fc8e8c61751263db88d4b6 (commit)
via aa798e6915bd39296bca8f62fd3476293c25f436 (commit)
via 23baab324564d36322b265c7fd904a0b4548c195 (commit)
via 03c82ef2950a25085e8d8ec0dc5d261fa1ca7963 (commit)
via 2eb85f70168d331e49e9d38bfbd2292d586dfcc1 (commit)
via 5857ebe3b0e512d76871020f1b08d49a9f4de70b (commit)
via 06237272c9c8b3bfefe00308b2749c8df823ebdf (commit)
via c5795cc6f73d5affc55a332fcddc37fa56636f9a (commit)
via 9359659d79a0c17265ff8a09e896920243a1b800 (commit)
via fd228a5ac00d71170eadef15560ced417b1d3909 (commit)
via d03facf18d724c52c09604710b074d465febfece (commit)
via 086f6cc8645e655f75c84268e7e758856a07be87 (commit)
via bcb86b69fba693af210e82d40d92854e609157c4 (commit)
via 23995e4bd823ff1a9f4986ac2b852fd35d740940 (commit)
via f64238be677ff7f67cb5ac71ecac534d0c4aa488 (commit)
from 294e83e3d69e3da8dbced2059323d8680349f548 (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 8ca0b1449607ded51e908481cc4660c20f43a777
Merge: bf97bb3 b3e8a48
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date: Fri Feb 2 15:45:41 2018 +0100
Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk
Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>
commit bf97bb37d38df9d6edd1a6b0c4227ee9846a4905
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date: Fri Feb 2 15:41:44 2018 +0100
Arvados class now accepts additional parameter which specifies max
number of failed connection retries
Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>
diff --git a/sdk/R/R/Arvados.R b/sdk/R/R/Arvados.R
index 6493b89..ea4384b 100644
--- a/sdk/R/R/Arvados.R
+++ b/sdk/R/R/Arvados.R
@@ -16,7 +16,7 @@ Arvados <- R6::R6Class(
public = list(
- initialize = function(authToken = NULL, hostName = NULL)
+ initialize = function(authToken = NULL, hostName = NULL, numRetries = 0)
{
if(!is.null(hostName))
Sys.setenv(ARVADOS_API_HOST = hostName)
@@ -32,8 +32,11 @@ Arvados <- R6::R6Class(
"or set ARVADOS_API_HOST and ARVADOS_API_TOKEN",
"environment variables."))
- private$REST <- RESTService$new(token, hostName, NULL,
- HttpRequest$new(), HttpParser$new())
+ private$numRetries <- numRetries
+ private$REST <- RESTService$new(token, hostName,
+ HttpRequest$new(), HttpParser$new(),
+ numRetries)
+
private$token <- private$REST$token
private$host <- private$REST$hostName
},
@@ -44,6 +47,12 @@ Arvados <- R6::R6Class(
getRESTService = function() private$REST,
setRESTService = function(newRESTService) private$REST <- newRESTService,
+ getNumRetries = function() private$REST$numRetries,
+ setNumRetries = function(newNumOfRetries)
+ {
+ private$REST$setNumRetries(newNumOfRetries)
+ },
+
getCollection = function(uuid)
{
collection <- private$REST$getResource("collections", uuid)
@@ -156,9 +165,10 @@ Arvados <- R6::R6Class(
private = list(
- token = NULL,
- host = NULL,
- REST = NULL
+ token = NULL,
+ host = NULL,
+ REST = NULL,
+ numRetries = NULL
),
cloneable = FALSE
diff --git a/sdk/R/R/HttpRequest.R b/sdk/R/R/HttpRequest.R
index 53c8e22..f8ad0a6 100644
--- a/sdk/R/R/HttpRequest.R
+++ b/sdk/R/R/HttpRequest.R
@@ -16,7 +16,7 @@ HttpRequest <- R6::R6Class(
},
execute = function(verb, url, headers = NULL, body = NULL, query = NULL,
- limit = NULL, offset = NULL, retryTimes = 3)
+ limit = NULL, offset = NULL, retryTimes = 0)
{
if(!(verb %in% self$validVerbs))
stop("Http verb is not valid.")
@@ -25,8 +25,9 @@ HttpRequest <- R6::R6Class(
urlQuery <- self$createQuery(query, limit, offset)
url <- paste0(url, urlQuery)
+ # times = 1 regular call + numberOfRetries
response <- httr::RETRY(verb, url = url, body = body,
- config = headers, times = retryTimes)
+ config = headers, times = retryTimes + 1)
},
createQuery = function(filters, limit, offset)
diff --git a/sdk/R/R/RESTService.R b/sdk/R/R/RESTService.R
index 74031b0..12e6591 100644
--- a/sdk/R/R/RESTService.R
+++ b/sdk/R/R/RESTService.R
@@ -8,8 +8,12 @@ RESTService <- R6::R6Class(
token = NULL,
http = NULL,
httpParser = NULL,
+ numRetries = NULL,
- initialize = function(token, hostName, webDavHostName = NULL, http, httpParser)
+ initialize = function(token, hostName,
+ http, httpParser,
+ numRetries = 0,
+ webDavHostName = NULL)
{
version <- "v1"
@@ -18,11 +22,17 @@ RESTService <- R6::R6Class(
"/arvados/", version, "/")
self$http <- http
self$httpParser <- httpParser
+ self$numRetries <- numRetries
private$rawHostName <- hostName
private$webDavHostName <- webDavHostName
},
+ setNumConnRetries = function(newNumOfRetries)
+ {
+ self$numRetries <- newNumOfRetries
+ },
+
getWebDavHostName = function()
{
if(is.null(private$webDavHostName))
@@ -32,7 +42,8 @@ RESTService <- R6::R6Class(
headers <- list(Authorization = paste("OAuth2", self$token))
- serverResponse <- self$http$execute("GET", discoveryDocumentURL, headers)
+ serverResponse <- self$http$execute("GET", discoveryDocumentURL, headers,
+ retryTimes = self$numRetries)
discoveryDocument <- self$httpParser$parseJSONResponse(serverResponse)
private$webDavHostName <- discoveryDocument$keepWebServiceUrl
@@ -49,7 +60,8 @@ RESTService <- R6::R6Class(
resourceURL <- paste0(self$hostName, resource, "/", uuid)
headers <- list(Authorization = paste("OAuth2", self$token))
- serverResponse <- self$http$execute("GET", resourceURL, headers)
+ serverResponse <- self$http$execute("GET", resourceURL, headers,
+ retryTimes = self$numRetries)
resource <- self$httpParser$parseJSONResponse(serverResponse)
@@ -66,7 +78,8 @@ RESTService <- R6::R6Class(
body <- NULL
serverResponse <- self$http$execute("GET", resourceURL, headers, body,
- filters, limit, offset)
+ filters, limit, offset,
+ self$numRetries)
resources <- self$httpParser$parseJSONResponse(serverResponse)
@@ -85,13 +98,14 @@ RESTService <- R6::R6Class(
items <- c()
while(length(items) < itemsAvailable)
{
- serverResponse <- self$http$execute(verb = "GET",
- url = resourceURL,
- headers = headers,
- body = NULL,
- query = filters,
- limit = NULL,
- offset = offset)
+ serverResponse <- self$http$execute(verb = "GET",
+ url = resourceURL,
+ headers = headers,
+ body = NULL,
+ query = filters,
+ limit = NULL,
+ offset = offset,
+ retryTimes = self$numRetries)
parsedResponse <- self$httpParser$parseJSONResponse(serverResponse)
@@ -112,7 +126,8 @@ RESTService <- R6::R6Class(
headers <- list("Authorization" = paste("OAuth2", self$token),
"Content-Type" = "application/json")
- serverResponse <- self$http$execute("DELETE", collectionURL, headers)
+ serverResponse <- self$http$execute("DELETE", collectionURL, headers,
+ retryTimes = self$numRetries)
removedResource <- self$httpParser$parseJSONResponse(serverResponse)
@@ -130,7 +145,8 @@ RESTService <- R6::R6Class(
newContent <- jsonlite::toJSON(newContent, auto_unbox = T)
- serverResponse <- self$http$execute("PUT", resourceURL, headers, newContent)
+ serverResponse <- self$http$execute("PUT", resourceURL, headers, newContent,
+ retryTimes = self$numRetries)
updatedResource <- self$httpParser$parseJSONResponse(serverResponse)
@@ -148,7 +164,8 @@ RESTService <- R6::R6Class(
content <- jsonlite::toJSON(content, auto_unbox = T)
- serverResponse <- self$http$execute("POST", resourceURL, headers, content)
+ serverResponse <- self$http$execute("POST", resourceURL, headers, content,
+ retryTimes = self$numRetries)
newResource <- self$httpParser$parseJSONResponse(serverResponse)
@@ -172,7 +189,8 @@ RESTService <- R6::R6Class(
uuid, "/", relativePath);
headers <- list(Authorization = paste("OAuth2", self$token))
- serverResponse <- self$http$execute("DELETE", fileURL, headers)
+ serverResponse <- self$http$execute("DELETE", fileURL, headers,
+ retryTimes = self$numRetries)
if(serverResponse$status_code < 200 || serverResponse$status_code >= 300)
stop(paste("Server code:", serverResponse$status_code))
@@ -189,7 +207,8 @@ RESTService <- R6::R6Class(
headers <- list("Authorization" = paste("OAuth2", self$token),
"Destination" = toURL)
- serverResponse <- self$http$execute("MOVE", fromURL, headers)
+ serverResponse <- self$http$execute("MOVE", fromURL, headers,
+ retryTimes = self$numRetries)
if(serverResponse$status_code < 200 || serverResponse$status_code >= 300)
stop(paste("Server code:", serverResponse$status_code))
@@ -204,7 +223,8 @@ RESTService <- R6::R6Class(
headers <- list("Authorization" = paste("OAuth2", self$token))
- response <- self$http$execute("PROPFIND", collectionURL, headers)
+ response <- self$http$execute("PROPFIND", collectionURL, headers,
+ retryTimes = self$numRetries)
if(all(response == ""))
stop("Response is empty, request may be misconfigured")
@@ -224,7 +244,8 @@ RESTService <- R6::R6Class(
headers <- list("Authorization" = paste("OAuth2", self$token))
- response <- self$http$execute("PROPFIND", subcollectionURL, headers)
+ response <- self$http$execute("PROPFIND", subcollectionURL, headers,
+ retryTimes = self$numRetries)
if(all(response == ""))
stop("Response is empty, request may be misconfigured")
@@ -260,7 +281,8 @@ RESTService <- R6::R6Class(
if(!(contentType %in% self$httpParser$validContentTypes))
stop("Invalid contentType. Please use text or raw.")
- serverResponse <- self$http$execute("GET", fileURL, headers)
+ serverResponse <- self$http$execute("GET", fileURL, headers,
+ retryTimes = self$numRetries)
if(serverResponse$status_code < 200 || serverResponse$status_code >= 300)
stop(paste("Server code:", serverResponse$status_code))
@@ -276,7 +298,8 @@ RESTService <- R6::R6Class(
"Content-Type" = contentType)
body <- content
- serverResponse <- self$http$execute("PUT", fileURL, headers, body)
+ serverResponse <- self$http$execute("PUT", fileURL, headers, body,
+ retryTimes = self$numRetries)
if(serverResponse$status_code < 200 || serverResponse$status_code >= 300)
stop(paste("Server code:", serverResponse$status_code))
@@ -312,7 +335,8 @@ RESTService <- R6::R6Class(
"Content-Type" = contentType)
body <- NULL
- serverResponse <- self$http$execute("PUT", fileURL, headers, body)
+ serverResponse <- self$http$execute("PUT", fileURL, headers, body,
+ retryTimes = self$numRetries)
if(serverResponse$status_code < 200 || serverResponse$status_code >= 300)
stop(paste("Server code:", serverResponse$status_code))
diff --git a/sdk/R/README b/sdk/R/README
index 8a0c31d..4c99c75 100644
--- a/sdk/R/README
+++ b/sdk/R/README
@@ -28,6 +28,16 @@ library('ArvadosR')
arv <- Arvados$new() # uses environment variables ARVADOS_API_TOKEN and ARVADOS_API_HOST
arv <- Arvados$new("your Arvados token", "example.arvadosapi.com")
+
+#Optionally, add numRetries parameter to specify number of times to retry failed service requests.
+#Default is 0.
+
+arv <- Arvados$new("your Arvados token", "example.arvadosapi.com", numRetries = 3)
+
+#This parameter can be set at any time using setNumRetries
+
+arv$setNumRetries(5)
+
--------------------------------------------------------------------------------------------------------------------------------
#Get a collection:
diff --git a/sdk/R/tests/testthat/fakes/FakeHttpRequest.R b/sdk/R/tests/testthat/fakes/FakeHttpRequest.R
index c46e03b..5336028 100644
--- a/sdk/R/tests/testthat/fakes/FakeHttpRequest.R
+++ b/sdk/R/tests/testthat/fakes/FakeHttpRequest.R
@@ -57,7 +57,7 @@ FakeHttpRequest <- R6::R6Class(
},
execute = function(verb, url, headers = NULL, body = NULL, query = NULL,
- limit = NULL, offset = NULL, retryTimes = 3)
+ limit = NULL, offset = NULL, retryTimes = 0)
{
private$validateURL(url)
private$validateHeaders(headers)
diff --git a/sdk/R/tests/testthat/test-RESTService.R b/sdk/R/tests/testthat/test-RESTService.R
index abc34d9..72c9e12 100644
--- a/sdk/R/tests/testthat/test-RESTService.R
+++ b/sdk/R/tests/testthat/test-RESTService.R
@@ -10,7 +10,7 @@ test_that("getWebDavHostName calls REST service properly", {
serverResponse <- list(keepWebServiceUrl = "https://myWebDavServer.com")
httpRequest <- FakeHttpRequest$new(expectedURL, serverResponse)
- REST <- RESTService$new("token", "host", NULL,
+ REST <- RESTService$new("token", "host",
httpRequest, FakeHttpParser$new())
REST$getWebDavHostName()
@@ -25,7 +25,7 @@ test_that("getWebDavHostName returns webDAV host name properly", {
serverResponse <- list(keepWebServiceUrl = "https://myWebDavServer.com")
httpRequest <- FakeHttpRequest$new(expectedURL = NULL, serverResponse)
- REST <- RESTService$new("token", "host", NULL,
+ REST <- RESTService$new("token", "host",
httpRequest, FakeHttpParser$new())
expect_that("https://myWebDavServer.com", equals(REST$getWebDavHostName()))
@@ -39,8 +39,9 @@ test_that("getResource calls REST service properly", {
httpRequest <- FakeHttpRequest$new(expectedURL, serverResponse)
- REST <- RESTService$new("token", "host", "webDavHost",
- httpRequest, FakeHttpParser$new())
+ REST <- RESTService$new("token", "host",
+ httpRequest, FakeHttpParser$new(),
+ 0, "webDavHost")
REST$getResource("collections", resourceUUID)
@@ -53,8 +54,9 @@ test_that("getResource parses server response", {
resourceUUID <- "aaaaa-j7d0g-ccccccccccccccc"
httpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "host", "webDavHost",
- FakeHttpRequest$new(), httpParser)
+ REST <- RESTService$new("token", "host",
+ FakeHttpRequest$new(), httpParser,
+ 0, "webDavHost")
REST$getResource("collections", resourceUUID)
@@ -66,9 +68,10 @@ test_that("getResource raises exception if response contains errors field", {
resourceUUID <- "aaaaa-j7d0g-ccccccccccccccc"
serverResponse <- list(errors = 404)
- REST <- RESTService$new("token", "host", "webDavHost",
+ REST <- RESTService$new("token", "host",
FakeHttpRequest$new(NULL, serverResponse),
- FakeHttpParser$new())
+ FakeHttpParser$new(),
+ 0, "webDavHost")
expect_that(REST$getResource("collections", resourceUUID), throws_error(404))
})
@@ -79,8 +82,9 @@ test_that("listResources calls REST service properly", {
expectedURL <- paste0("https://host/arvados/v1/collections")
httpRequest <- FakeHttpRequest$new(expectedURL, serverResponse)
- REST <- RESTService$new("token", "host", "webDavHost",
- httpRequest, FakeHttpParser$new())
+ REST <- RESTService$new("token", "host",
+ httpRequest, FakeHttpParser$new(),
+ 0, "webDavHost")
REST$listResources("collections")
@@ -92,8 +96,9 @@ test_that("listResources calls REST service properly", {
test_that("listResources parses server response", {
httpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "host", "webDavHost",
- FakeHttpRequest$new(), httpParser)
+ REST <- RESTService$new("token", "host",
+ FakeHttpRequest$new(), httpParser,
+ 0, "webDavHost")
REST$listResources("collections")
@@ -104,9 +109,10 @@ test_that("listResources raises exception if response contains errors field", {
serverResponse <- list(errors = 404)
- REST <- RESTService$new("token", "host", "webDavHost",
+ REST <- RESTService$new("token", "host",
FakeHttpRequest$new(NULL, serverResponse),
- FakeHttpParser$new())
+ FakeHttpParser$new(),
+ 0, "webDavHost")
expect_that(REST$listResources("collections"), throws_error(404))
})
@@ -128,8 +134,9 @@ test_that("fetchAllItems always returns all resource items from server", {
httpRequest <- FakeHttpRequest$new(expectedURL, serverResponse)
httpRequest$serverMaxElementsPerRequest <- 3
- REST <- RESTService$new("token", "host", "webDavHost",
- httpRequest, httpParser)
+ REST <- RESTService$new("token", "host",
+ httpRequest, httpParser,
+ 0, "webDavHost")
result <- REST$fetchAllItems(NULL, NULL)
@@ -146,8 +153,9 @@ test_that("deleteResource calls REST service properly", {
httpRequest <- FakeHttpRequest$new(expectedURL, serverResponse)
- REST <- RESTService$new("token", "host", "webDavHost",
- httpRequest, FakeHttpParser$new())
+ REST <- RESTService$new("token", "host",
+ httpRequest, FakeHttpParser$new(),
+ 0, "webDavHost")
REST$deleteResource("collections", resourceUUID)
@@ -160,8 +168,9 @@ test_that("deleteCollection parses server response", {
resourceUUID <- "aaaaa-j7d0g-ccccccccccccccc"
httpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "host", "webDavHost",
- FakeHttpRequest$new(), httpParser)
+ REST <- RESTService$new("token", "host",
+ FakeHttpRequest$new(), httpParser,
+ 0, "webDavHost")
REST$deleteResource("collections", resourceUUID)
@@ -173,9 +182,10 @@ test_that("deleteCollection raises exception if response contains errors field",
resourceUUID <- "aaaaa-j7d0g-ccccccccccccccc"
serverResponse <- list(errors = 404)
- REST <- RESTService$new("token", "host", "webDavHost",
+ REST <- RESTService$new("token", "host",
FakeHttpRequest$new(NULL, serverResponse),
- FakeHttpParser$new())
+ FakeHttpParser$new(),
+ 0, "webDavHost")
expect_that(REST$deleteResource("collections", resourceUUID), throws_error(404))
})
@@ -189,8 +199,9 @@ test_that("updateResource calls REST service properly", {
httpRequest <- FakeHttpRequest$new(expectedURL, serverResponse)
- REST <- RESTService$new("token", "host", "webDavHost",
- httpRequest, FakeHttpParser$new())
+ REST <- RESTService$new("token", "host",
+ httpRequest, FakeHttpParser$new(),
+ 0, "webDavHost")
REST$updateResource("collections", resourceUUID, newResourceContent)
@@ -205,8 +216,9 @@ test_that("updateResource parses server response", {
newResourceContent <- list(newName = "Brand new shiny name")
resourceUUID <- "aaaaa-j7d0g-ccccccccccccccc"
httpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "host", "webDavHost",
- FakeHttpRequest$new(), httpParser)
+ REST <- RESTService$new("token", "host",
+ FakeHttpRequest$new(), httpParser,
+ 0, "webDavHost")
REST$updateResource("collections", resourceUUID, newResourceContent)
@@ -218,9 +230,10 @@ test_that("updateResource raises exception if response contains errors field", {
resourceUUID <- "aaaaa-j7d0g-ccccccccccccccc"
serverResponse <- list(errors = 404)
newResourceContent <- list(newName = "Brand new shiny name")
- REST <- RESTService$new("token", "host", "webDavHost",
+ REST <- RESTService$new("token", "host",
FakeHttpRequest$new(NULL, serverResponse),
- FakeHttpParser$new())
+ FakeHttpParser$new(),
+ 0, "webDavHost")
expect_that(REST$updateResource("collections", resourceUUID, newResourceContent),
throws_error(404))
@@ -236,8 +249,9 @@ test_that("createResource calls REST service properly", {
httpRequest <- FakeHttpRequest$new(expectedURL, serverResponse)
- REST <- RESTService$new("token", "host", "webDavHost",
- httpRequest, FakeHttpParser$new())
+ REST <- RESTService$new("token", "host",
+ httpRequest, FakeHttpParser$new(),
+ 0, "webDavHost")
REST$createResource("collections", resourceContent)
@@ -252,8 +266,9 @@ test_that("createResource parses server response", {
resourceContent <- list(newName = "Brand new shiny name")
resourceUUID <- "aaaaa-j7d0g-ccccccccccccccc"
httpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "host", "webDavHost",
- FakeHttpRequest$new(), httpParser)
+ REST <- RESTService$new("token", "host",
+ FakeHttpRequest$new(), httpParser,
+ 0, "webDavHost")
REST$createResource("collections", resourceContent)
@@ -265,9 +280,10 @@ test_that("createResource raises exception if response contains errors field", {
resourceUUID <- "aaaaa-j7d0g-ccccccccccccccc"
serverResponse <- list(errors = 404)
resourceContent <- list(newName = "Brand new shiny name")
- REST <- RESTService$new("token", "host", "webDavHost",
+ REST <- RESTService$new("token", "host",
FakeHttpRequest$new(NULL, serverResponse),
- FakeHttpParser$new())
+ FakeHttpParser$new(),
+ 0, "webDavHost")
expect_that(REST$createResource("collections", resourceContent),
throws_error(404))
@@ -280,8 +296,9 @@ test_that("create calls REST service properly", {
fakeHttp <- FakeHttpRequest$new(expectedURL)
fakeHttpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, fakeHttpParser)
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, fakeHttpParser,
+ 0, "https://webDavHost/")
REST$create("file", uuid)
@@ -297,8 +314,9 @@ test_that("create raises exception if server response code is not between 200 an
response$status_code <- 404
fakeHttp <- FakeHttpRequest$new(serverResponse = response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, HttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, HttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$create("file", uuid),
throws_error("Server code: 404"))
@@ -311,8 +329,9 @@ test_that("delete calls REST service properly", {
fakeHttp <- FakeHttpRequest$new(expectedURL)
fakeHttpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, fakeHttpParser)
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, fakeHttpParser,
+ 0, "https://webDavHost/")
REST$delete("file", uuid)
@@ -328,8 +347,9 @@ test_that("delete raises exception if server response code is not between 200 an
response$status_code <- 404
fakeHttp <- FakeHttpRequest$new(serverResponse = response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, HttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, HttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$delete("file", uuid),
throws_error("Server code: 404"))
@@ -342,8 +362,9 @@ test_that("move calls REST service properly", {
fakeHttp <- FakeHttpRequest$new(expectedURL)
fakeHttpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, fakeHttpParser)
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, fakeHttpParser,
+ 0, "https://webDavHost/")
REST$move("file", "newDestination/file", uuid)
@@ -360,8 +381,9 @@ test_that("move raises exception if server response code is not between 200 and
response$status_code <- 404
fakeHttp <- FakeHttpRequest$new(serverResponse = response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, HttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, HttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$move("file", "newDestination/file", uuid),
throws_error("Server code: 404"))
@@ -377,8 +399,9 @@ test_that("getCollectionContent retreives correct content from WebDAV server", {
fakeHttp <- FakeHttpRequest$new(expectedURL, returnContent)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, FakeHttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, FakeHttpParser$new(),
+ 0, "https://webDavHost/")
returnResult <- REST$getCollectionContent(uuid)
returnedContentMatchExpected <- all.equal(returnResult,
@@ -394,8 +417,9 @@ test_that("getCollectionContent raises exception if server returns empty respons
response <- ""
fakeHttp <- FakeHttpRequest$new(serverResponse = response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, FakeHttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, FakeHttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$getCollectionContent(uuid),
throws_error("Response is empty, request may be misconfigured"))
@@ -405,8 +429,9 @@ test_that("getCollectionContent parses server response", {
uuid <- "aaaaa-j7d0g-ccccccccccccccc"
fakeHttpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- FakeHttpRequest$new(), fakeHttpParser)
+ REST <- RESTService$new("token", "https://host/",
+ FakeHttpRequest$new(), fakeHttpParser,
+ 0, "https://webDavHost/")
REST$getCollectionContent(uuid)
@@ -419,8 +444,9 @@ test_that("getCollectionContent raises exception if server returns empty respons
response <- ""
fakeHttp <- FakeHttpRequest$new(serverResponse = response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, FakeHttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, FakeHttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$getCollectionContent(uuid),
throws_error("Response is empty, request may be misconfigured"))
@@ -434,8 +460,9 @@ test_that(paste("getCollectionContent raises exception if server",
response$status_code <- 404
fakeHttp <- FakeHttpRequest$new(serverResponse = response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, HttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, HttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$getCollectionContent(uuid),
throws_error("Server code: 404"))
@@ -451,8 +478,9 @@ test_that("getResourceSize calls REST service properly", {
response$content <- c(6, 2, 931, 12003)
fakeHttp <- FakeHttpRequest$new(expectedURL, response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, FakeHttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, FakeHttpParser$new(),
+ 0, "https://webDavHost/")
returnResult <- REST$getResourceSize("file", uuid)
returnedContentMatchExpected <- all.equal(returnResult,
@@ -469,8 +497,9 @@ test_that("getResourceSize raises exception if server returns empty response", {
response <- ""
fakeHttp <- FakeHttpRequest$new(serverResponse = response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, FakeHttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, FakeHttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$getResourceSize("file", uuid),
throws_error("Response is empty, request may be misconfigured"))
@@ -484,8 +513,9 @@ test_that(paste("getResourceSize raises exception if server",
response$status_code <- 404
fakeHttp <- FakeHttpRequest$new(serverResponse = response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, HttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, HttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$getResourceSize("file", uuid),
throws_error("Server code: 404"))
@@ -495,8 +525,9 @@ test_that("getResourceSize parses server response", {
uuid <- "aaaaa-j7d0g-ccccccccccccccc"
fakeHttpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- FakeHttpRequest$new(), fakeHttpParser)
+ REST <- RESTService$new("token", "https://host/",
+ FakeHttpRequest$new(), fakeHttpParser,
+ 0, "https://webDavHost/")
REST$getResourceSize("file", uuid)
@@ -513,8 +544,9 @@ test_that("read calls REST service properly", {
fakeHttp <- FakeHttpRequest$new(expectedURL, serverResponse)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, FakeHttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, FakeHttpParser$new(),
+ 0, "https://webDavHost/")
returnResult <- REST$read("file", uuid, "text", 1024, 512)
@@ -531,8 +563,9 @@ test_that("read raises exception if server response code is not between 200 and
response$status_code <- 404
fakeHttp <- FakeHttpRequest$new(serverResponse = response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, HttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, HttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$read("file", uuid),
throws_error("Server code: 404"))
@@ -543,8 +576,9 @@ test_that("read raises exception if contentType is not valid", {
uuid <- "aaaaa-j7d0g-ccccccccccccccc"
fakeHttp <- FakeHttpRequest$new()
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, HttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, HttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$read("file", uuid, "some invalid content type"),
throws_error("Invalid contentType. Please use text or raw."))
@@ -554,8 +588,9 @@ test_that("read parses server response", {
uuid <- "aaaaa-j7d0g-ccccccccccccccc"
fakeHttpParser <- FakeHttpParser$new()
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- FakeHttpRequest$new(), fakeHttpParser)
+ REST <- RESTService$new("token", "https://host/",
+ FakeHttpRequest$new(), fakeHttpParser,
+ 0, "https://webDavHost/")
REST$read("file", uuid, "text", 1024, 512)
@@ -569,8 +604,9 @@ test_that("write calls REST service properly", {
expectedURL <- "https://webDavHost/c=aaaaa-j7d0g-ccccccccccccccc/file"
fakeHttp <- FakeHttpRequest$new(expectedURL)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, FakeHttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, FakeHttpParser$new(),
+ 0, "https://webDavHost/")
REST$write("file", uuid, fileContent, "text/html")
@@ -588,8 +624,9 @@ test_that("write raises exception if server response code is not between 200 and
response$status_code <- 404
fakeHttp <- FakeHttpRequest$new(serverResponse = response)
- REST <- RESTService$new("token", "https://host/", "https://webDavHost/",
- fakeHttp, HttpParser$new())
+ REST <- RESTService$new("token", "https://host/",
+ fakeHttp, HttpParser$new(),
+ 0, "https://webDavHost/")
expect_that(REST$write("file", uuid, fileContent, "text/html"),
throws_error("Server code: 404"))
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list