From 0079d73e9f617a0ece58dbc19327f0ac84f338f9 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Sun, 17 May 2015 00:34:40 +0200 Subject: [PATCH] Add a bit of sleeping. --- src/vo/GVOClient.cpp | 4 ++-- test/test_GVO.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vo/GVOClient.cpp b/src/vo/GVOClient.cpp index e8b3c77..0e91644 100644 --- a/src/vo/GVOClient.cpp +++ b/src/vo/GVOClient.cpp @@ -41,6 +41,7 @@ /* __ Method name definitions ____________________________________________ */ #define G_FIND_HUB "GVOClient::find_hub()" +#define G_REQUIRE_HUB "GVOClient::require_hub()" #define G_REGISTER_TO_HUB "GVOClient::register_to_hub()" /* __ Macros _____________________________________________________________ */ @@ -620,7 +621,7 @@ bool GVOClient::require_hub(void) int pid = fork(); if (pid < 0) { std::string msg = "Unable to create child process for VO Hub."; - throw GException::runtime_error(G_FIND_HUB, msg); + throw GException::runtime_error(G_REQUIRE_HUB, msg); } // If we have a PID of 0 we are in the child process. In this case @@ -639,7 +640,6 @@ bool GVOClient::require_hub(void) for (int i = 0; i < 5; ++i) { found = find_hub() && ping_hub(); if (found) { -std::cout << "*** Hub is alive ***" << std::endl; break; } sleep(1); diff --git a/test/test_GVO.cpp b/test/test_GVO.cpp index cc2a1e9..1dffcc9 100644 --- a/test/test_GVO.cpp +++ b/test/test_GVO.cpp @@ -120,6 +120,9 @@ void TestGVO::test_GVOHub(void) // We now shutdown the Hub via the client client.shutdown_hub(); + // Sleep a bit to make sure that we exit without a Hub + sleep(1); + // Return return; } -- libgit2 0.21.4