TestIconLoader: enable some disabled tests

(bzr r4008.7.20)

1 files changed, 8 insertions, 11 deletions

diff --git a/tests/test_icon_loader.cpp b/tests/test_icon_loader.cpp
index c817832aa..549e21117 100644
--- a/tests/test_icon_loader.cpp
+++ b/tests/test_icon_loader.cpp
@@ -53,6 +53,7 @@ struct LoadResult
 
 void CheckResults(std::vector<LoadResult> const& results)
 {
+ Utils::WaitPendingEvents(WAIT_TIMEOUT);
 Utils::WaitUntilMSec([&results] {
 bool got_all = true;
 for (auto const& result : results)
@@ -101,8 +102,7 @@ TEST_F(TestIconLoader, TestGetDefault)
 EXPECT_EQ(&icon_loader, &IconLoader::GetDefault());
 }
 
-// FIXME: Disabled due to issues on Jenkins using GLibDBusProxy (lp:1224643)
-TEST_F(TestIconLoader, DISABLED_TestGetOneIcon)
+TEST_F(TestIconLoader, TestGetOneIcon)
 {
 LoadResult load_result;
 
@@ -110,13 +110,12 @@ TEST_F(TestIconLoader, DISABLED_TestGetOneIcon)
 &LoadResult::IconLoaded));
 handles_.push_back(handle);
 
- Utils::WaitUntilMSec(load_result.got_callback, WAIT_TIMEOUT);
+ Utils::WaitPendingEvents(WAIT_TIMEOUT);
 EXPECT_TRUE(load_result.got_callback);
 EXPECT_TRUE(IsValidPixbuf(load_result.pixbuf));
 }
 
-// FIXME: Disabled due to issues on Jenkins using GLibDBusProxy (lp:1224643)
-TEST_F(TestIconLoader, DISABLED_TestGetAnnotatedIcon)
+TEST_F(TestIconLoader, TestGetAnnotatedIcon)
 {
 LoadResult load_result;
 
@@ -124,13 +123,12 @@ TEST_F(TestIconLoader, DISABLED_TestGetAnnotatedIcon)
 &LoadResult::IconLoaded));
 handles_.push_back(handle);
 
- Utils::WaitUntilMSec(load_result.got_callback, WAIT_TIMEOUT);
+ Utils::WaitPendingEvents(WAIT_TIMEOUT);
 EXPECT_TRUE(load_result.got_callback);
 EXPECT_TRUE(IsValidPixbuf(load_result.pixbuf));
 }
 
-// FIXME: Disabled due to issues on Jenkins using GLibDBusProxy (lp:1224643)
-TEST_F(TestIconLoader, DISABLED_TestGetColorizedIcon)
+TEST_F(TestIconLoader, TestGetColorizedIcon)
 {
 LoadResult load_result;
 
@@ -138,7 +136,7 @@ TEST_F(TestIconLoader, DISABLED_TestGetColorizedIcon)
 &LoadResult::IconLoaded));
 handles_.push_back(handle);
 
- Utils::WaitUntilMSec(load_result.got_callback, WAIT_TIMEOUT);
+ Utils::WaitPendingEvents(WAIT_TIMEOUT);
 EXPECT_TRUE(load_result.got_callback);
 EXPECT_TRUE(IsValidPixbuf(load_result.pixbuf));
 }
@@ -173,8 +171,7 @@ TEST_F(TestIconLoader, TestGetOneIconManyTimes)
 CheckResults(results);
 }
 
-// Disabled until we have the new thread safe lp:fontconfig
-TEST_F(TestIconLoader, DISABLED_TestGetManyIcons)
+TEST_F(TestIconLoader, TestGetManyIcons)
 {
 std::vector<LoadResult> results;
 int i = 0;