From abe7582c42012b26e5ecd14a0ff704c75a667cde Mon Sep 17 00:00:00 2001 From: Jakub Tyszkowski Date: Thu, 24 Jul 2014 10:38:05 +0200 Subject: [PATCH] android/tester-ng: Fix trying to verify late callbacks Dont even try to verify late callbacks when test case already ended. This was triggering confusing message about verifying step N+1 when we have only N steps in current case. --- android/tester-main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/android/tester-main.c b/android/tester-main.c index 40416d703..c86894384 100644 --- a/android/tester-main.c +++ b/android/tester-main.c @@ -543,8 +543,15 @@ static gboolean verify_action(gpointer user_data) static gboolean verify_callback(gpointer user_data) { + struct test_data *data = tester_get_data(); struct step *step = user_data; + /* Return if callback came when all steps are already verified */ + if (queue_isempty(data->steps)) { + destroy_callback_step(step); + return FALSE; + } + /* * TODO: This may call action from next step before callback data * from previous step was freed. -- 2.47.3