From 0165920bb715ba6bbd14aed5dd4ddfab426d4d7d Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Sat, 6 Nov 2021 08:38:41 -0700 Subject: [PATCH 1/4] FuelClient.cc: include Fixes the Windows build. Signed-off-by: Steve Peters --- src/FuelClient.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/FuelClient.cc b/src/FuelClient.cc index a5e72ca6..3eb6c2f8 100644 --- a/src/FuelClient.cc +++ b/src/FuelClient.cc @@ -25,6 +25,7 @@ #endif #include +#include #include #include #include From 2d5f362054ac458d85fa54736a02c670030d2667 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Sat, 6 Nov 2021 12:02:40 -0700 Subject: [PATCH 2/4] ign_src_TEST: print error messages Signed-off-by: Steve Peters --- src/ign_src_TEST.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ign_src_TEST.cc b/src/ign_src_TEST.cc index 622bb9a3..9fd0cd88 100644 --- a/src/ign_src_TEST.cc +++ b/src/ign_src_TEST.cc @@ -630,7 +630,8 @@ TEST_P(DownloadCollectionTest, Worlds) // Check output EXPECT_NE(stdOutBuffer.str().find("Download succeeded"), std::string::npos) << stdOutBuffer.str(); - EXPECT_TRUE(stdErrBuffer.str().empty()); + EXPECT_TRUE(stdErrBuffer.str().empty()) + << stdErrBuffer.str(); // Check files // Model: Backpack From 51bfe2567cd6ddbd36d1855c70b58fa7d4e55a9d Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Sat, 6 Nov 2021 22:35:53 -0700 Subject: [PATCH 3/4] print one more error message Signed-off-by: Steve Peters --- src/ign_src_TEST.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ign_src_TEST.cc b/src/ign_src_TEST.cc index 9fd0cd88..f5d16e0c 100644 --- a/src/ign_src_TEST.cc +++ b/src/ign_src_TEST.cc @@ -492,7 +492,8 @@ TEST_P(DownloadCollectionTest, AllItems) // Check output EXPECT_NE(stdOutBuffer.str().find("Download succeeded"), std::string::npos) << stdOutBuffer.str(); - EXPECT_TRUE(stdErrBuffer.str().empty()); + EXPECT_TRUE(stdErrBuffer.str().empty()) + << stdErrBuffer.str(); // Check files // Model: Backpack From 821f8daf037a2692720b7085649f3f13979cb850 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Sat, 6 Nov 2021 23:20:55 -0700 Subject: [PATCH 4/4] ign.cc: remove console error message This was introduced in #199. Signed-off-by: Steve Peters --- src/ign.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ign.cc b/src/ign.cc index a3b65e3d..0ca5a0bb 100644 --- a/src/ign.cc +++ b/src/ign.cc @@ -638,9 +638,6 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, if (downloadWorlds) { auto result = client.DownloadWorlds(worldIds, _jobs); - ignerr << "Failed to download worlds for collection [" - << collection.Name() - << "]" << std::endl; } } else