From 18ca4edc212f20c55d5859065dfc0579b3bfd8a0 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 4 Nov 2016 10:58:39 -0500 Subject: break test-notification into two separate test units --- tests/libdbusmock-fixture.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'tests/libdbusmock-fixture.h') diff --git a/tests/libdbusmock-fixture.h b/tests/libdbusmock-fixture.h index ef42fbf..7301042 100644 --- a/tests/libdbusmock-fixture.h +++ b/tests/libdbusmock-fixture.h @@ -75,14 +75,7 @@ protected: // wait a little while for the scaffolding to shut down, // but don't block on it forever... - unsigned int cleartry = 0; - while (((system_bus != nullptr) || (session_bus != nullptr)) && (cleartry < 50)) - { - g_usleep(100000); - while (g_main_pending(nullptr)) - g_main_iteration(nullptr, true); - cleartry++; - } + wait_for([this](){return system_bus==nullptr && session_bus==nullptr;}, 5000); super::TearDown(); } -- cgit v1.2.3