summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2012-12-11 21:56:13 -0500
committerKristian Høgsberg <krh@bitplanet.net>2012-12-11 21:58:22 -0500
commitf63fab724111af4927b9e36d0ffbbcf3e870f2d0 (patch)
tree8c3ec0a4c44cbf8ac2b5306e8f8b43c56f4155db /tests
parentdb6dc7d47024a82d6a979888ade2067bda4dc563 (diff)
button-test: Use wl_display_roundtrip instead of yield()
A round trip is sufficient here. We need to make sure that the server has received the wl_test request and that we've received the event that the request triggers. The wl_display_roundtrip() helper does exactly that: it sends a wl_display.sync request, which will hit the server after the wl_test requests and thus the wl_callback.done event will come back after the server has seen all the previous requests and after we've handled all preceeding event.
Diffstat (limited to 'tests')
-rw-r--r--tests/button-test.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/button-test.c b/tests/button-test.c
index 0f9367e6..2bb2e7f5 100644
--- a/tests/button-test.c
+++ b/tests/button-test.c
@@ -42,13 +42,13 @@ TEST(simple_button_test)
wl_test_send_button(client->test->wl_test, BTN_LEFT,
WL_POINTER_BUTTON_STATE_PRESSED);
- yield(client);
+ wl_display_roundtrip(client->wl_display);
assert(pointer->button == BTN_LEFT);
assert(pointer->state == WL_POINTER_BUTTON_STATE_PRESSED);
wl_test_send_button(client->test->wl_test, BTN_LEFT,
WL_POINTER_BUTTON_STATE_RELEASED);
- yield(client);
+ wl_display_roundtrip(client->wl_display);
assert(pointer->button == BTN_LEFT);
assert(pointer->state == WL_POINTER_BUTTON_STATE_RELEASED);
}