Skip to content

Commit b954474

Browse files
author
DenverM80
committed
fix bulk_get tests for 3.0
1 parent fa998c5 commit b954474

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

test/bulk_get.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ BOOST_AUTO_TEST_CASE( bulk_get ) {
170170
error = ds3_get_bulk_job_spectra_s3_request(client, request, &bulk_response);
171171
ds3_request_free(request);
172172
ds3_bulk_object_list_response_free(object_list);
173-
BOOST_CHECK(handle_error_and_return_is_null(error));
173+
handle_error(error);
174174

175175
chunk_response = ensure_available_chunks(client, bulk_response->job_id);
176-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
176+
handle_error(error);
177177

178178
checksum_result* checksum_results = (checksum_result*) calloc(num_files, sizeof(checksum_result));
179179
checkChunkResponse(client, num_files, chunk_response, checksum_results);
@@ -231,11 +231,11 @@ BOOST_AUTO_TEST_CASE( max_upload_size ) {
231231
ds3_request_free(request);
232232
ds3_bulk_object_list_response_free(object_list);
233233

234-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
234+
handle_error(error);
235235

236236
chunk_response = ensure_available_chunks(client, bulk_response->job_id);
237237

238-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
238+
handle_error(error);
239239

240240
checksum_result* checksum_results = (checksum_result*) calloc(num_files, sizeof(checksum_result));
241241
checkChunkResponse(client, num_files, chunk_response, checksum_results);
@@ -292,15 +292,15 @@ BOOST_AUTO_TEST_CASE( chunk_preference ) {
292292
error = ds3_get_bulk_job_spectra_s3_request(client, request, &bulk_response);
293293
ds3_request_free(request);
294294
ds3_bulk_object_list_response_free(object_list);
295-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
295+
handle_error(error);
296296

297297
do {
298298
retry_get = false;
299299
request = ds3_init_get_job_chunks_ready_for_client_processing_spectra_s3_request(bulk_response->job_id->value);
300300
error = ds3_get_job_chunks_ready_for_client_processing_spectra_s3_request(client, request, &chunk_response);
301301
ds3_request_free(request);
302302

303-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
303+
handle_error(error);
304304
BOOST_REQUIRE(chunk_response != NULL);
305305

306306
if (chunk_response->num_objects == 0) {
@@ -314,7 +314,7 @@ BOOST_AUTO_TEST_CASE( chunk_preference ) {
314314
}
315315
} while(retry_get);
316316

317-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
317+
handle_error(error);
318318

319319
checksum_result* checksum_results = (checksum_result*) calloc(num_files, sizeof(checksum_result));
320320
checkChunkResponse(client, num_files, chunk_response, checksum_results);
@@ -367,10 +367,10 @@ BOOST_AUTO_TEST_CASE( partial_get ) {
367367
error = ds3_get_bulk_job_spectra_s3_request(client, request, &bulk_response);
368368
ds3_request_free(request);
369369
ds3_bulk_object_list_response_free(object_list);
370-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
370+
handle_error(error);
371371

372372
chunk_response = ensure_available_chunks(client, bulk_response->job_id);
373-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
373+
handle_error(error);
374374

375375
checksum_result* checksum_results = (checksum_result*) calloc(num_files, sizeof(checksum_result));
376376
checkChunkResponsePartials(client, num_files, chunk_response, checksum_results, 3200);

0 commit comments

Comments
 (0)