From f13047bf9334795b89b09fef3a051e7dfbe207f2 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 27 Dec 2018 18:19:31 -0600 Subject: [PATCH] stktest: Fix immediate response test Commit f39d7efb53a6f80650ce87ced675e7ae2fd049c4 changed the amount of time an immediate response text is displayed. Fix stktest accordingly. --- tools/stktest.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/tools/stktest.c b/tools/stktest.c index 140b447b..c83d4839 100644 --- a/tools/stktest.c +++ b/tools/stktest.c @@ -1189,30 +1189,6 @@ static void expect_response_and_not_canceled_after_3(const unsigned char *pdu, g_idle_add(end_session_and_not_canceled_after_3, NULL); } -static gboolean poweroff_and_canceled_after_21(gpointer user_data) -{ - __stktest_test_finish(pending == NULL); - return FALSE; -} - -static gboolean end_session_and_canceled_after_21(gpointer user_data) -{ - g_at_server_send_unsolicited(emulator, "+CUSATEND"); - g_timeout_add_seconds(21, poweroff_and_canceled_after_21, NULL); - - return FALSE; -} - -static void expect_response_and_canceled_after_21(const unsigned char *pdu, - unsigned int len) -{ - struct test *test = cur_test->data; - - STKTEST_RESPONSE_ASSERT(test->rsp_pdu, test->rsp_len, pdu, len); - - g_idle_add(end_session_and_canceled_after_21, NULL); -} - static DBusMessage *test_display_text_11(DBusMessage *msg, const char *text, unsigned char icon_id, @@ -3510,7 +3486,7 @@ static void __stktest_test_init(void) display_text_response_421, sizeof(display_text_response_421), test_display_text_42, - expect_response_and_canceled_after_21); + expect_response_and_not_canceled_after_3); stktest_add_test("Display Text 4.3", "DisplayText", display_text_431, sizeof(display_text_431), display_text_response_431,