Merge lp:~townsend/unity/fix-icon-loader-test2 into lp:unity

[Christopher Townsend]

Increase the wait timeout to 15 seconds since 1 second didn't seem to make the unit test failure any better. Also add a timeout to the CheckResults method.

= Issue =
The 1 second timeout that I added previously to help some of the TestIconLoader unit tests pass is not sufficient.

= Fix =
Increase the timeout to 15 seconds. Also, I saw that the CheckResults() method was a WaitUntiMSec call that needs to have an increased timeout.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3515
http://jenkins.qa.ubuntu.com/job/unity-ci/368/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/256

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/368/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Pass icon loader!

review: Approve

=== modified file 'tests/test_icon_loader.cpp'
--- tests/test_icon_loader.cpp	2013-09-16 17:51:54 +0000
+++ tests/test_icon_loader.cpp	2013-09-18 14:30:02 +0000
@@ -28,7 +28,7 @@
 
 namespace
 {
-const int WAIT_TIMEOUT = 1000;
+const int WAIT_TIMEOUT = 15000; // 15 seconds
 
 bool IsValidPixbuf(GdkPixbuf *pixbuf)
 {
@@ -73,7 +73,7 @@
     }
 
     return got_all;
-  });
+  }, WAIT_TIMEOUT);
 
   for (auto const& result : results)
   {