summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDoug Nazar <nazard@nazar.ca>2021-04-13 06:40:43 -0400
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2021-04-13 11:59:35 +0000
commita1535a4dc363466357fcd1b4a61a4b7b22deb964 (patch)
tree859a8761a147e819e1fad48edf95499b3e3b4940 /tests
parenta930b62afc7125e3186ade07bacf112a7588c053 (diff)
downloadgstreamer-plugins-bad-a1535a4dc363466357fcd1b4a61a4b7b22deb964.tar.gz
tests: fix shm test deadlock
Stopping the consumer first would occasionally allow the producer to fill the shm segment causing it to block in send() and unable to be stopped. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2158>
Diffstat (limited to 'tests')
-rw-r--r--tests/check/elements/shm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/check/elements/shm.c b/tests/check/elements/shm.c
index 69413cf0b..fed23c247 100644
--- a/tests/check/elements/shm.c
+++ b/tests/check/elements/shm.c
@@ -215,10 +215,10 @@ GST_START_TEST (test_shm_live)
g_signal_emit_by_name (sink, "pull-sample", &sample);
gst_sample_unref (sample);
- state_res = gst_element_set_state (consumer, GST_STATE_NULL);
+ state_res = gst_element_set_state (producer, GST_STATE_NULL);
fail_unless (state_res != GST_STATE_CHANGE_FAILURE);
- state_res = gst_element_set_state (producer, GST_STATE_NULL);
+ state_res = gst_element_set_state (consumer, GST_STATE_NULL);
fail_unless (state_res != GST_STATE_CHANGE_FAILURE);
gst_object_unref (consumer);