Merge lp:~mhr3/unity/safer-tests into lp:unity

[Michal Hruby]

Makes the tests less racy by using g_timeout_add instead of the add_seconds which tries to fire multiple timeouts at once at the cost of precision. Also fixes a possible crash in the tests caused by FilesystemLenses.

[Gord Allott (gordallott)]

+1, makes tests work again :)

review: Approve

=== modified file 'UnityCore/FilesystemLenses.cpp'
--- UnityCore/FilesystemLenses.cpp	2012-02-22 08:53:20 +0000
+++ UnityCore/FilesystemLenses.cpp	2012-03-05 17:03:24 +0000
@@ -236,7 +236,7 @@
   gboolean result = g_file_load_contents_finish(file, res,
                                                 &contents, &length,
                                                 NULL, error.AsOutParam());
-  if (result && !error)
+  if (result)
   {
     self->GetLensDataFromKeyFile(file, contents.Value(), length);
     self->SortLensList();
@@ -246,6 +246,8 @@
     LOG_WARN(logger) << "Unable to read lens file "
                      << path.Str() << ": "
                      << error;
+    if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+      return; // self is invalid now
   }
   
   self->cancel_map_.erase(file);
@@ -350,6 +352,7 @@
   ~Impl()
   {
     if (timeout_id != 0) g_source_remove (timeout_id);
+    finished_slot_.disconnect();
   }
 
   void OnLoadingFinished();
@@ -363,6 +366,7 @@
   FilesystemLenses* owner_;
   LensDirectoryReader::Ptr reader_;
   LensList lenses_;
+  sigc::connection finished_slot_;
   guint timeout_id;
 };
 
@@ -371,7 +375,7 @@
   , reader_(reader)
   , timeout_id(0)
 {
-  reader_->load_finished.connect(sigc::mem_fun(this, &Impl::OnLoadingFinished));
+  finished_slot_ = reader_->load_finished.connect(sigc::mem_fun(this, &Impl::OnLoadingFinished));
   if (reader_->IsDataLoaded())
   {
     // we won't get any signal, so let's just emit our signals after construction

=== modified file 'tests/TestPlacesResults.cpp'
--- tests/TestPlacesResults.cpp	2012-01-09 16:49:50 +0000
+++ tests/TestPlacesResults.cpp	2012-03-05 17:03:24 +0000
@@ -119,7 +119,7 @@
 
   nux::GetGraphicsThread()->SetLayout(layout);
 #endif
-  g_timeout_add_seconds(2, (GSourceFunc)remove_timeout, NULL);
+  g_timeout_add(2000, (GSourceFunc)remove_timeout, NULL);
 }
 
 void TestRunner::InitWindowThread(nux::NThread* thread, void* InitData)

=== modified file 'tests/test_filesystem_lenses.cpp'
--- tests/test_filesystem_lenses.cpp	2012-02-22 08:53:20 +0000
+++ tests/test_filesystem_lenses.cpp	2012-03-05 17:03:24 +0000
@@ -18,7 +18,7 @@
     return FALSE;
   };
 
-  guint32 timeout_id = g_timeout_add_seconds(10, timeout_cb, &timeout_reached);
+  guint32 timeout_id = g_timeout_add(10000, timeout_cb, &timeout_reached);
 
   while (!result && !timeout_reached)
   {

=== modified file 'tests/test_gdbus_proxy.cpp'
--- tests/test_gdbus_proxy.cpp	2012-02-21 17:13:56 +0000
+++ tests/test_gdbus_proxy.cpp	2012-03-05 17:03:24 +0000
@@ -60,8 +60,8 @@
     return FALSE;
   };
   
-  guint timeout_source = g_timeout_add_seconds(1, timeout_check, this); // check once a second
-  guint bailout_source = g_timeout_add_seconds(10, timeout_bailout, this); // bail out after ten
+  guint timeout_source = g_timeout_add(1000, timeout_check, this); // check once a second
+  guint bailout_source = g_timeout_add(10000, timeout_bailout, this); // bail out after ten
 
   g_main_loop_run(loop_);
   g_source_remove(timeout_source);
@@ -114,7 +114,7 @@
     return FALSE;
   };
    
-  guint bailout_source = g_timeout_add_seconds(10, timeout_bailout, this);
+  guint bailout_source = g_timeout_add(10000, timeout_bailout, this);
 
   EXPECT_EQ(proxy->IsConnected(), true); // fail if we are not connected
   proxy->Connect("TestSignal", signal_connection);

=== modified file 'tests/test_hud.cpp'
--- tests/test_hud.cpp	2012-01-12 11:45:05 +0000
+++ tests/test_hud.cpp	2012-03-05 17:03:24 +0000
@@ -57,8 +57,8 @@
     return FALSE;
   };
   
-  g_timeout_add_seconds(1, timeout_check, this);
-  g_timeout_add_seconds(10, timeout_bailout, this);
+  g_timeout_add(1000, timeout_check, this);
+  g_timeout_add(10000, timeout_bailout, this);
 
   g_main_loop_run(loop_);
   
@@ -87,7 +87,7 @@
    
   hud->queries_updated.connect(query_connection);
  
-  guint source_id = g_timeout_add_seconds(10, timeout_bailout, this);
+  guint source_id = g_timeout_add(10000, timeout_bailout, this);
  
   // next check we get 30 entries from this specific known callback
   hud->RequestQuery("Request30Queries");

=== modified file 'tests/test_main_dbus.cpp'
--- tests/test_main_dbus.cpp	2012-01-09 16:49:50 +0000
+++ tests/test_main_dbus.cpp	2012-03-05 17:03:24 +0000
@@ -59,7 +59,7 @@
                    NULL,
                    &have_name,
                    NULL);
-  g_timeout_add_seconds(10, timeout_cb, &timeout_reached);
+  g_timeout_add(10000, timeout_cb, &timeout_reached);
 
   while (!have_name && !timeout_reached)
     g_main_context_iteration(g_main_context_get_thread_default(), TRUE);

=== modified file 'tests/test_utils.h'
--- tests/test_utils.h	2012-02-04 05:28:23 +0000
+++ tests/test_utils.h	2012-03-05 17:03:24 +0000
@@ -22,7 +22,7 @@
       return FALSE;
     };
 
-    guint32 timeout_id = g_timeout_add_seconds(10, timeout_cb, &timeout_reached);
+    guint32 timeout_id = g_timeout_add(10000, timeout_cb, &timeout_reached);
 
     while (model.count != n_rows && !timeout_reached)
     {
@@ -48,7 +48,7 @@
 
   static guint32 ScheduleTimeout(bool* timeout_reached, unsigned int timeout_duration = 10)
   {
-    return g_timeout_add_seconds(timeout_duration, TimeoutCallback, timeout_reached);
+    return g_timeout_add(timeout_duration*1000, TimeoutCallback, timeout_reached);
   }
 
   static guint32 ScheduleTimeoutMSec(bool* timeout_reached, unsigned int timeout_duration = 10)