From f754a18ecfa111eef10c4c366e5abb80bc365025 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Thu, 17 Jul 2008 15:08:29 +0000 Subject: [PATCH] improved test_storage to report error conditions better --- test/test_storage.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/test/test_storage.cpp b/test/test_storage.cpp index 5f9190996..4b6a6b4c0 100644 --- a/test/test_storage.cpp +++ b/test/test_storage.cpp @@ -74,17 +74,34 @@ void on_read_piece(int ret, disk_io_job const& j, char const* data, int size) void on_check_resume_data(int ret, disk_io_job const& j) { - std::cerr << "on_check_resume_data ret: " << ret << " " << j.piece << std::endl; + std::cerr << "on_check_resume_data ret: " << ret; + switch (ret) + { + case 0: std::cerr << " success" << std::endl; break; + case -1: std::cerr << " need full check" << std::endl; break; + case -2: std::cerr << " disk error: " << j.str + << " file: " << j.error_file << std::endl; break; + case -3: std::cerr << " aborted" << std::endl; break; + } } void on_check_files(int ret, disk_io_job const& j) { - std::cerr << "on_check_files ret: " << ret << " " << j.piece << std::endl; + std::cerr << "on_check_files ret: " << ret; + + switch (ret) + { + case 0: std::cerr << " done" << std::endl; break; + case -1: std::cerr << " current slot: " << j.piece << std::endl; break; + case -2: std::cerr << " disk error: " << j.str + << " file: " << j.error_file << std::endl; break; + case -3: std::cerr << " aborted" << std::endl; break; + } } void on_move_storage(int ret, disk_io_job const& j, std::string path) { - std::cerr << "on_move_storage ret: " << ret << " path:" << j.str << std::endl; + std::cerr << "on_move_storage ret: " << ret << " path: " << j.str << std::endl; TEST_CHECK(ret == 0); TEST_CHECK(j.str == path); }