[banshee] MediaEngineTests: if Teardown() fails, avoid hanging
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] MediaEngineTests: if Teardown() fails, avoid hanging
- Date: Thu, 23 Jan 2014 17:20:08 +0000 (UTC)
commit 5a60e6a01c2e12be1a4a24a5a4d00ac46fbe121b
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Thu Jan 23 18:19:58 2014 +0100
MediaEngineTests: if Teardown() fails, avoid hanging
.../Banshee.Services/Banshee.MediaEngine/Tests.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/Tests.cs
b/src/Core/Banshee.Services/Banshee.MediaEngine/Tests.cs
index 28ebe62..8dd9974 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/Tests.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/Tests.cs
@@ -426,11 +426,19 @@ namespace Banshee.MediaEngine
[TestFixtureTearDown]
public void Teardown ()
{
- AssertTransition (() => service.Dispose (), PlayerState.Paused, PlayerState.Idle);
+ try {
+
+ AssertTransition (() => service.Dispose (), PlayerState.Paused, PlayerState.Idle);
- GLib.Idle.Add (delegate { main_loop.Quit (); return false; });
- main_thread.Join ();
- main_thread = null;
+ } finally {
+
+ GLib.Idle.Add (delegate {
+ main_loop.Quit ();
+ return false;
+ });
+ main_thread.Join ();
+ main_thread = null;
+ }
}
int play_when_idles = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]