diff --git a/include/norns/norns.h b/include/norns/norns.h index cb0bcffc0718a990aa396e2404fc599beb8a1dff..1e1b0c4fb92d494a5ccfe01051d13630aa0be4fa 100644 --- a/include/norns/norns.h +++ b/include/norns/norns.h @@ -32,9 +32,9 @@ #define NORNS_API_VERSION 10 #endif -#include -#include -#include +#include /* For uint32_t et al. */ +#include /* For bool */ +#include /* For struct timespec */ #include "norns_types.h" #include "norns_error.h" @@ -68,7 +68,8 @@ norns_submit(norns_iotask_t* task) __THROW; /* wait for the completion of the I/O task associated to 'task' */ norns_error_t -norns_wait(norns_iotask_t* task) __THROW; +norns_wait(norns_iotask_t* task, + const struct timespec* timeout) __THROW; /* Try to cancel an asynchronous I/O task associated with task */ norns_error_t diff --git a/include/norns/norns_error.h b/include/norns/norns_error.h index 23e7a73ba979f04367b846dea03a4dcf13c362f4..cc3f3b46a9e6dbb64c03a80d88983874c36e436d 100644 --- a/include/norns/norns_error.h +++ b/include/norns/norns_error.h @@ -45,12 +45,13 @@ extern "C" { #define NORNS_EBADARGS -2 #define NORNS_EBADREQUEST -3 #define NORNS_ENOMEM -4 +#define NORNS_ETIMEOUT -5 /* errors about communication */ -#define NORNS_ECONNFAILED -5 -#define NORNS_ERPCSENDFAILED -6 -#define NORNS_ERPCRECVFAILED -7 -#define NORNS_EACCEPTPAUSED -8 +#define NORNS_ECONNFAILED -6 +#define NORNS_ERPCSENDFAILED -7 +#define NORNS_ERPCRECVFAILED -8 +#define NORNS_EACCEPTPAUSED -9 /* errors about jobs */ #define NORNS_EJOBEXISTS -10 diff --git a/include/norns/norns_types.h b/include/norns/norns_types.h index 683d8acd391c6025b2ccc5e3868e38ad8ee6012a..ee2736a193149e7ac4bb027a677a8cb0fa217e43 100644 --- a/include/norns/norns_types.h +++ b/include/norns/norns_types.h @@ -29,8 +29,6 @@ #define __NORNS_TYPES_H__ 1 #include -#include /* For uint32_t et al. */ -#include #ifdef __cplusplus extern "C" { diff --git a/include/norns/nornsctl.h b/include/norns/nornsctl.h index 6333454b60fd4602cd855c802b785541ac850b53..7856f79d593bfa104567c24f1d7658c2638fc94b 100644 --- a/include/norns/nornsctl.h +++ b/include/norns/nornsctl.h @@ -32,6 +32,10 @@ #define NORNSCTL_API_VERSION 10 #endif +#include /* For uint32_t et al. */ +#include /* For bool */ +#include /* For struct timespec */ + #include "norns_types.h" #include "norns_error.h" @@ -191,7 +195,8 @@ nornsctl_submit(norns_iotask_t* task) __THROW; /* wait for the completion of the I/O task associated to 'task' */ norns_error_t -nornsctl_wait(norns_iotask_t* task) __THROW; +nornsctl_wait(norns_iotask_t* task, + const struct timespec* timeout) __THROW; /* Try to cancel an asynchronous I/O task associated with task */ norns_error_t diff --git a/lib/errors.c b/lib/errors.c index c312e288e3307b7ce080bca46ad084139817029d..6cad31854d53bc4d6431090322add83e5d36f13a 100644 --- a/lib/errors.c +++ b/lib/errors.c @@ -35,6 +35,7 @@ const char* const norns_errlist[NORNS_ERRMAX + 1] = { [ERR_REMAP(NORNS_EBADREQUEST)] = "Bad request", [ERR_REMAP(NORNS_EBADARGS)] = "Bad arguments", [ERR_REMAP(NORNS_ENOMEM)] = "Cannot allocate memory", + [ERR_REMAP(NORNS_ETIMEOUT)] = "Timeout exceeded", /* communication errors */ [ERR_REMAP(NORNS_ECONNFAILED)] = "Cannot connect to daemon", diff --git a/lib/libnorns.c b/lib/libnorns.c index ed8de57932721c6160977bd7c68197d96fe85717..61a84628fae6442b06447381538e731b4c47fdd0 100644 --- a/lib/libnorns.c +++ b/lib/libnorns.c @@ -46,7 +46,12 @@ #include "defaults.h" #define LIBNORNS_LOG_PREFIX "libnorns" -#define MIN_WAIT_TIME ((useconds_t) 250*1e3) + +// default timeout is 250 microseconds +const struct timespec LIBNORNS_DEFAULT_TIMEOUT = { + .tv_sec = 0, + .tv_nsec = (250L*1e3L) +}; static void load_config_file(void) { @@ -216,7 +221,8 @@ norns_error(norns_iotask_t* task, norns_stat_t* stats) { /* wait for the completion of the I/O task associated to 'task' */ norns_error_t -norns_wait(norns_iotask_t* task) { +norns_wait(norns_iotask_t* task, + const struct timespec* timeout) { norns_error_t rv; norns_stat_t stats; @@ -226,7 +232,16 @@ norns_wait(norns_iotask_t* task) { return NORNS_EBADARGS; } + // if user provided a timeout, suspend this thread for + // (at least) the amount of time requested + struct timespec requested = + timeout == NULL ? + LIBNORNS_DEFAULT_TIMEOUT : + *timeout; + struct timespec remaining; + do { + // check if task has finished rv = send_status_request(task, &stats); if(rv != NORNS_SUCCESS) { @@ -239,9 +254,31 @@ norns_wait(norns_iotask_t* task) { return NORNS_SUCCESS; } - // wait for 250 milliseconds - // before retrying - usleep(MIN_WAIT_TIME); + // task not finished: sleep + if(nanosleep(&requested, &remaining) != 0) { + if(errno != EINTR) { + ERR("nanosleep error: %s", norns_strerror(rv)); + if(errno == EINVAL) { + return NORNS_EBADARGS; + } + return NORNS_ESNAFU; + } + + // EINTR: we've been interrupted, check the task status again just + // in case it's finished and we can avoid sleeping again + requested = + timeout == NULL ? + LIBNORNS_DEFAULT_TIMEOUT : + remaining; + // fall through + } + + if(timeout == NULL) { + continue; + } + + return NORNS_ETIMEOUT; + } while(true); return NORNS_SUCCESS; diff --git a/lib/libnornsctl.c b/lib/libnornsctl.c index 0e7c03d060846d84720d0942d6198e3754439cf9..b3810de178c788e4930efc13d1e27130c2fc12fd 100644 --- a/lib/libnornsctl.c +++ b/lib/libnornsctl.c @@ -45,7 +45,12 @@ #include "defaults.h" #define LIBNORNSCTL_LOG_PREFIX "libnornsctl" -#define MIN_WAIT_TIME ((useconds_t) 250*1e3) + +// default timeout is 250 microseconds +const struct timespec LIBNORNSCTL_DEFAULT_TIMEOUT = { + .tv_sec = 0, + .tv_nsec = (250L*1e3L) +}; static bool validate_job(nornsctl_job_t* job); static bool validate_namespace(nornsctl_backend_t* backend); @@ -402,7 +407,8 @@ nornsctl_error(norns_iotask_t* task, /* wait for the completion of the I/O task associated to 'task' */ norns_error_t -nornsctl_wait(norns_iotask_t* task) { +nornsctl_wait(norns_iotask_t* task, + const struct timespec* timeout) { norns_error_t rv; norns_stat_t stats; @@ -412,7 +418,16 @@ nornsctl_wait(norns_iotask_t* task) { return NORNS_EBADARGS; } + // if user provided a timeout, suspend this thread for + // (at least) the amount of time requested + struct timespec requested = + timeout == NULL ? + LIBNORNSCTL_DEFAULT_TIMEOUT : + *timeout; + struct timespec remaining; + do { + // check if task has finished rv = send_status_request(task, &stats); if(rv != NORNS_SUCCESS) { @@ -425,9 +440,31 @@ nornsctl_wait(norns_iotask_t* task) { return NORNS_SUCCESS; } - // wait for 250 milliseconds - // before retrying - usleep(MIN_WAIT_TIME); + // task not finished: sleep + if(nanosleep(&requested, &remaining) != 0) { + if(errno != EINTR) { + ERR("nanosleep error: %s", norns_strerror(rv)); + if(errno == EINVAL) { + return NORNS_EBADARGS; + } + return NORNS_ESNAFU; + } + + // EINTR: we've been interrupted, check the task status again just + // in case it's finished and we can avoid sleeping again + requested = + timeout == NULL ? + LIBNORNSCTL_DEFAULT_TIMEOUT : + remaining; + // fall through + } + + if(timeout == NULL) { + continue; + } + + return NORNS_ETIMEOUT; + } while(true); return NORNS_SUCCESS; diff --git a/tests/api-copy-local-data.cpp b/tests/api-copy-local-data.cpp index 1e99cf974f4d47dcae1884e3a8c0f65c27ea7f0e..e584a0f00e4570dc4b98063fcfb2ce7176bfd5bf 100644 --- a/tests/api-copy-local-data.cpp +++ b/tests/api-copy-local-data.cpp @@ -155,7 +155,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -190,7 +190,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -225,7 +225,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -267,7 +267,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -306,7 +306,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -345,7 +345,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -385,7 +385,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -425,7 +425,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -465,7 +465,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -504,7 +504,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -545,7 +545,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -581,7 +581,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -618,7 +618,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -655,7 +655,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -692,7 +692,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -729,7 +729,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -766,7 +766,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -803,7 +803,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -840,7 +840,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -877,7 +877,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -913,7 +913,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -946,7 +946,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -981,7 +981,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1016,7 +1016,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1051,7 +1051,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1086,7 +1086,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1123,7 +1123,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1158,7 +1158,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1193,7 +1193,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1228,7 +1228,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1264,7 +1264,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1299,7 +1299,7 @@ SCENARIO("copy local POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1399,7 +1399,7 @@ SCENARIO("copy local memory buffer to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1434,7 +1434,7 @@ SCENARIO("copy local memory buffer to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1466,7 +1466,7 @@ SCENARIO("copy local memory buffer to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1526,7 +1526,7 @@ SCENARIO("copy local memory buffer to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1574,7 +1574,7 @@ SCENARIO("copy local memory buffer to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); diff --git a/tests/api-copy-remote-data.cpp b/tests/api-copy-remote-data.cpp index 6a88aec28c2a16a3a7381f44108efc01900ac60d..2bfe759abb42a2f725d2f2d090460ee18e24fd36 100644 --- a/tests/api-copy-remote-data.cpp +++ b/tests/api-copy-remote-data.cpp @@ -162,7 +162,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -197,7 +197,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -215,6 +215,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", } } + //TODO this is no longer an error, we should move it to another section // - trying to copy an empty directory WHEN("copying an empty NORNS_LOCAL_PATH directory") { @@ -232,12 +233,12 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); - THEN("NORNS_SUCCESS and ENOENT are reported") { + THEN("norns_error() reports NORNS_SUCCESS") { norns_stat_t stats; rv = norns_error(&task, &stats); @@ -273,7 +274,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -312,7 +313,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -350,7 +351,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -390,7 +391,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -430,7 +431,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -469,7 +470,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -509,7 +510,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -666,7 +667,7 @@ SCENARIO("copy local POSIX file to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -714,7 +715,7 @@ SCENARIO("copy local POSIX file to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -761,7 +762,7 @@ SCENARIO("copy local POSIX file to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -810,7 +811,7 @@ SCENARIO("copy local POSIX file to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -857,7 +858,7 @@ SCENARIO("copy local POSIX file to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -904,7 +905,7 @@ SCENARIO("copy local POSIX file to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -951,7 +952,7 @@ SCENARIO("copy local POSIX file to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -998,7 +999,7 @@ SCENARIO("copy local POSIX file to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1045,7 +1046,7 @@ SCENARIO("copy local POSIX file to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1092,7 +1093,7 @@ SCENARIO("copy local POSIX file to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1256,7 +1257,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1300,7 +1301,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1346,7 +1347,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1392,7 +1393,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1438,7 +1439,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1484,7 +1485,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1571,7 +1572,7 @@ SCENARIO("copy local memory region to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1613,7 +1614,7 @@ SCENARIO("copy local memory region to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_error() reports NORNS_EFINISHED") { norns_stat_t stats; @@ -1721,7 +1722,7 @@ SCENARIO("errors copying local memory region to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1806,7 +1807,7 @@ SCENARIO("errors copying local memory region to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1869,7 +1870,7 @@ SCENARIO("errors copying local memory region to remote POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2088,7 +2089,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2132,7 +2133,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2176,7 +2177,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2220,7 +2221,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2265,7 +2266,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2310,7 +2311,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2472,7 +2473,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2508,7 +2509,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2526,6 +2527,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", } } + //TODO this is no longer an error, we should move it to another section // - trying to copy an empty directory WHEN("copying an empty NORNS_LOCAL_PATH directory") { @@ -2544,7 +2546,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2586,7 +2588,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2627,7 +2629,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2665,7 +2667,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2705,7 +2707,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2745,7 +2747,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2784,7 +2786,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2824,7 +2826,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2982,7 +2984,7 @@ SCENARIO("copy remote POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3029,7 +3031,7 @@ SCENARIO("copy remote POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3075,7 +3077,7 @@ SCENARIO("copy remote POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3123,7 +3125,7 @@ SCENARIO("copy remote POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3171,7 +3173,7 @@ SCENARIO("copy remote POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3219,7 +3221,7 @@ SCENARIO("copy remote POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3267,7 +3269,7 @@ SCENARIO("copy remote POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3315,7 +3317,7 @@ SCENARIO("copy remote POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3363,7 +3365,7 @@ SCENARIO("copy remote POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3411,7 +3413,7 @@ SCENARIO("copy remote POSIX file to local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3573,7 +3575,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3618,7 +3620,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3665,7 +3667,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3712,7 +3714,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3759,7 +3761,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3806,7 +3808,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3985,7 +3987,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -4029,7 +4031,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -4073,7 +4075,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -4117,7 +4119,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -4162,7 +4164,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -4207,7 +4209,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); diff --git a/tests/api-ctl-copy-local-data.cpp b/tests/api-ctl-copy-local-data.cpp index 0b8318a387f2050bb9c29b8dd0735e5af8a4acd3..5aa7c5090315db99108c419f2cc2a95807430f0e 100644 --- a/tests/api-ctl-copy-local-data.cpp +++ b/tests/api-ctl-copy-local-data.cpp @@ -156,7 +156,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -192,7 +192,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -228,7 +228,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -271,7 +271,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -311,7 +311,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -351,7 +351,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -391,7 +391,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -431,7 +431,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -471,7 +471,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -510,7 +510,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -552,7 +552,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -589,7 +589,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -626,7 +626,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -663,7 +663,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -700,7 +700,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -737,7 +737,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -774,7 +774,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -811,7 +811,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -848,7 +848,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -885,7 +885,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -921,7 +921,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -954,7 +954,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -989,7 +989,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1024,7 +1024,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1059,7 +1059,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1094,7 +1094,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1131,7 +1131,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1166,7 +1166,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1201,7 +1201,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1236,7 +1236,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1272,7 +1272,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1308,7 +1308,7 @@ SCENARIO("copy local POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1408,7 +1408,7 @@ SCENARIO("copy local memory buffer to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1443,7 +1443,7 @@ SCENARIO("copy local memory buffer to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1475,7 +1475,7 @@ SCENARIO("copy local memory buffer to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1535,7 +1535,7 @@ SCENARIO("copy local memory buffer to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1583,7 +1583,7 @@ SCENARIO("copy local memory buffer to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); diff --git a/tests/api-ctl-copy-remote-data.cpp b/tests/api-ctl-copy-remote-data.cpp index 82c23160aa2f47d17ea7acc6e2a01f94505e1e72..a55520d4309d3c0b03a772ac79a5cf6e415efc20 100644 --- a/tests/api-ctl-copy-remote-data.cpp +++ b/tests/api-ctl-copy-remote-data.cpp @@ -162,7 +162,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -197,7 +197,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -232,7 +232,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -273,7 +273,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -312,7 +312,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -350,7 +350,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -390,7 +390,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -430,7 +430,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -469,7 +469,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -509,7 +509,7 @@ SCENARIO("errors copying local POSIX path to remote POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -666,7 +666,7 @@ SCENARIO("copy local POSIX file to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -714,7 +714,7 @@ SCENARIO("copy local POSIX file to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -761,7 +761,7 @@ SCENARIO("copy local POSIX file to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -810,7 +810,7 @@ SCENARIO("copy local POSIX file to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -857,7 +857,7 @@ SCENARIO("copy local POSIX file to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -904,7 +904,7 @@ SCENARIO("copy local POSIX file to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -951,7 +951,7 @@ SCENARIO("copy local POSIX file to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -998,7 +998,7 @@ SCENARIO("copy local POSIX file to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1045,7 +1045,7 @@ SCENARIO("copy local POSIX file to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1092,7 +1092,7 @@ SCENARIO("copy local POSIX file to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1256,7 +1256,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1300,7 +1300,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1346,7 +1346,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1392,7 +1392,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1438,7 +1438,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1484,7 +1484,7 @@ SCENARIO("copy local POSIX file to remote POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1571,7 +1571,7 @@ SCENARIO("copy local memory region to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1613,7 +1613,7 @@ SCENARIO("copy local memory region to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_error() reports NORNS_EFINISHED") { norns_stat_t stats; @@ -1721,7 +1721,7 @@ SCENARIO("errors copying local memory region to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1806,7 +1806,7 @@ SCENARIO("errors copying local memory region to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -1869,7 +1869,7 @@ SCENARIO("errors copying local memory region to remote POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2088,7 +2088,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2132,7 +2132,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2176,7 +2176,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2220,7 +2220,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2265,7 +2265,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2310,7 +2310,7 @@ SCENARIO("copy local POSIX path to remote POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2472,7 +2472,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2508,7 +2508,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2544,7 +2544,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2586,7 +2586,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2627,7 +2627,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2665,7 +2665,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2705,7 +2705,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2745,7 +2745,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2784,7 +2784,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2824,7 +2824,7 @@ SCENARIO("errors copying remote POSIX path to local POSIX path (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -2982,7 +2982,7 @@ SCENARIO("copy remote POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3029,7 +3029,7 @@ SCENARIO("copy remote POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() return NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3075,7 +3075,7 @@ SCENARIO("copy remote POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3123,7 +3123,7 @@ SCENARIO("copy remote POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3171,7 +3171,7 @@ SCENARIO("copy remote POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3219,7 +3219,7 @@ SCENARIO("copy remote POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3267,7 +3267,7 @@ SCENARIO("copy remote POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3315,7 +3315,7 @@ SCENARIO("copy remote POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3363,7 +3363,7 @@ SCENARIO("copy remote POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3411,7 +3411,7 @@ SCENARIO("copy remote POSIX file to local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3573,7 +3573,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3618,7 +3618,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3665,7 +3665,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3712,7 +3712,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3759,7 +3759,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3806,7 +3806,7 @@ SCENARIO("copy remote POSIX subdir to local POSIX subdir (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -3985,7 +3985,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -4029,7 +4029,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -4073,7 +4073,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -4117,7 +4117,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -4162,7 +4162,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -4207,7 +4207,7 @@ SCENARIO("copy remote POSIX path to local POSIX path involving links (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); diff --git a/tests/api-ctl-remove-local-data.cpp b/tests/api-ctl-remove-local-data.cpp index 73fdf06695aa02ea2e4a114f1a878bfdd20b16bf..42f2f64432222564d562445de2ae35b04a6feb01 100644 --- a/tests/api-ctl-remove-local-data.cpp +++ b/tests/api-ctl-remove-local-data.cpp @@ -153,7 +153,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -187,7 +187,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -227,7 +227,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -265,7 +265,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -303,7 +303,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -342,7 +342,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -381,7 +381,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -420,7 +420,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -460,7 +460,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -490,7 +490,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -521,7 +521,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -548,7 +548,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -574,7 +574,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -607,7 +607,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -639,7 +639,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -671,7 +671,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -703,7 +703,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -734,7 +734,7 @@ SCENARIO("remove a local POSIX file (admin)", REQUIRE(task.t_id != 0); // wait until the task completes - rv = nornsctl_wait(&task); + rv = nornsctl_wait(&task, NULL); THEN("nornsctl_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); diff --git a/tests/api-remove-local-data.cpp b/tests/api-remove-local-data.cpp index 2a3bd3c680f449e05ed72d474d5570bc67ceeb34..451f2bec1ba98fd1705f7c46dd9c539ddace5197 100644 --- a/tests/api-remove-local-data.cpp +++ b/tests/api-remove-local-data.cpp @@ -153,7 +153,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -187,7 +187,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -227,7 +227,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -265,7 +265,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -303,7 +303,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -342,7 +342,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -381,7 +381,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -420,7 +420,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -460,7 +460,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -490,7 +490,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -521,7 +521,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -548,7 +548,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -574,7 +574,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -607,7 +607,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -639,7 +639,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -671,7 +671,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -703,7 +703,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); @@ -734,7 +734,7 @@ SCENARIO("remove a local POSIX file", REQUIRE(task.t_id != 0); // wait until the task completes - rv = norns_wait(&task); + rv = norns_wait(&task, NULL); THEN("norns_wait() returns NORNS_SUCCESS") { REQUIRE(rv == NORNS_SUCCESS); diff --git a/tests/api-send-command.cpp b/tests/api-send-command.cpp index dcafdc92a0382510c99e110c2cd28ac246c35fe0..2eaaf7a4220cc0446e3bcc7aa3ca0e43ec44fd7b 100644 --- a/tests/api-send-command.cpp +++ b/tests/api-send-command.cpp @@ -144,7 +144,7 @@ SCENARIO("send control commands to urd", "[api::nornsctl_send_command]") { REQUIRE(rv == NORNS_ETASKSPENDING); AND_WHEN("all tasks complete") { - rv = nornsctl_wait(&tasks[ntasks-1]); + rv = nornsctl_wait(&tasks[ntasks-1], NULL); THEN("nornsctl_send_command() returns NORNS_SUCCESS") { rv = nornsctl_send_command(NORNSCTL_CMD_SHUTDOWN, NULL);