Merge lp:~sil2100/unity/more_arm_test_modifications into lp:unity

[Łukasz Zemczak]

Disable TestAnimator tests, since we're getting rid of the Animator class anyway. Also, in the glib timeout tests - in MultipleShotsRun only check if the timeout is ran more than once, since this is the behavior we're interested in.

- Problem:

Still some tests are failing on ARM machines, resulting in a FTBFS.

- The fix:

This branch has two fixes:
First, and most important, we disable the TestAnimator tests in overall. After consulting with Martin and Stephen, we decided that this is the easiest way to be sure that the broken tests on ARM won't fail builds - since we're getting rid of the Animator class anyway.

Second, in the glib timeout tests, let's be even less strict and in MultipleShotsRun only check if it runs more than once. Since this is the behavior we're essentially testing. Not the number of times it should be executed in the time period.

- Tests:

N/A

[Stephen M. Webb (bregma)]

Avoids the test for me. Need to run these tests on actual hardware, so let's get this merged.

review: Approve

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-12-03 12:49:46 +0000
+++ tests/CMakeLists.txt	2012-12-03 13:12:24 +0000
@@ -115,7 +115,7 @@
 # The actual test executable (xless) - do not put anything that requires X in here
   set (GTEST_XLESS_SOURCES
        test_main_xless.cpp
-       test_animator.cpp
+       #test_animator.cpp # XXX: disabled, to be removed completely soon
        test_launcher_model.cpp
        test_glib_object.cpp
        test_glib_object_utils.cpp

=== modified file 'tests/test_glib_source.cpp'
--- tests/test_glib_source.cpp	2012-11-30 20:22:13 +0000
+++ tests/test_glib_source.cpp	2012-12-03 13:12:24 +0000
@@ -150,7 +150,7 @@
   bool removed_called = false;
 
   {
-  auto check_function = []() { return (callback_call_count < 6) ? false : true; };
+  auto check_function = []() { return (callback_call_count > 1) ? true : false; };
   Timeout timeout(100, &OnSourceCallbackContinue);
   timeout.removed.connect([&] (unsigned int id) { removed_called = true; });
   Utils::WaitUntil(check_function, true, 1);
@@ -158,7 +158,7 @@
   }
 
   EXPECT_TRUE(callback_called);
-  EXPECT_GE(callback_call_count, 6);
+  EXPECT_GT(callback_call_count, 1);
   EXPECT_TRUE(removed_called);
 }