diff options
| author | Colin Watson <cjwatson@ubuntu.com> | 2014-01-06 12:07:00 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-01-06 21:27:31 +0200 |
| commit | 139159cfd158afa8bf747d56e7cf5bfff09a48e0 (patch) | |
| tree | 39b661583b8bc5d7c6830eec79ed7300bd65d342 /unit/test-gobex-transfer.c | |
| parent | 26381ed7d895f3bf4d704039df1a4d29b06ca5b2 (diff) | |
| download | bluez-139159cfd158afa8bf747d56e7cf5bfff09a48e0.tar.gz | |
unit: Fix test failures with glib 2.39.0
glib 2.39.0 made this change:
- g_source_remove() will now throw a critical in the case that you
try to remove a non-existent source. We expect that there is some
code in the wild that will fall afoul of this new critical but
considering that we now reuse source IDs, this code is already
broken and should probably be fixed.
This patch fixes the test suite to keep better track of whether sources have
already been removed and avoid double-removals.
Diffstat (limited to 'unit/test-gobex-transfer.c')
| -rw-r--r-- | unit/test-gobex-transfer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/unit/test-gobex-transfer.c b/unit/test-gobex-transfer.c index ef05047a5..128a4673e 100644 --- a/unit/test-gobex-transfer.c +++ b/unit/test-gobex-transfer.c @@ -1805,7 +1805,8 @@ static void test_conn_rsp(void) g_source_remove(timer_id); g_io_channel_unref(io); - g_source_remove(io_id); + if (!d.io_completed) + g_source_remove(io_id); g_obex_unref(obex); g_assert_no_error(d.err); @@ -2060,7 +2061,8 @@ static void test_conn_get_wrg_rsp(void) g_source_remove(timer_id); g_io_channel_unref(io); - g_source_remove(io_id); + if (!d.io_completed) + g_source_remove(io_id); g_obex_unref(obex); g_assert_no_error(d.err); |