test apps: fix termination logic

diff --git a/cts-verifier/cts-verifier-publish-test.c b/cts-verifier/cts-verifier-publish-test.c
index 5d26cc70428c05238d89878698c7cd512a7f72f9..04b3336dd2e786ab494b7a64e77ead64c82355fa 100644 (file)
--- a/cts-verifier/cts-verifier-publish-test.c
+++ b/cts-verifier/cts-verifier-publish-test.c
@@ -270,6 +270,7 @@ static void clear_resources()
        g_publish_handle = NULL;
 
        if (g_wifi_aware_session) {
+               wifi_aware_session_stop(g_wifi_aware_session);
                wifi_aware_session_unset_message_received_cb(g_wifi_aware_session);
                wifi_aware_session_unset_terminated_cb(g_wifi_aware_session);
                wifi_aware_session_destroy(g_wifi_aware_session);

diff --git a/cts-verifier/cts-verifier-subscribe-test.c b/cts-verifier/cts-verifier-subscribe-test.c
index 50d18ad4f675c4639c0789122b2ecfc2c7f9dc83..7e88a16877dd3259cc9a873688b3576af83ececb 100644 (file)
--- a/cts-verifier/cts-verifier-subscribe-test.c
+++ b/cts-verifier/cts-verifier-subscribe-test.c
@@ -274,6 +274,7 @@ static void clear_resources()
        g_subscribe_handle = NULL;
 
        if (g_wifi_aware_session) {
+               wifi_aware_session_stop(g_wifi_aware_session);
                wifi_aware_session_unset_message_received_cb(g_wifi_aware_session);
                wifi_aware_session_unset_service_discovered_cb(g_wifi_aware_session);
                wifi_aware_session_unset_terminated_cb(g_wifi_aware_session);

diff --git a/test/wifi-aware-publish-test.c b/test/wifi-aware-publish-test.c
index cce3e017a723fdd1eda1de8d025ecf726977de98..0a7e7a014273539998966a2bb7987d86e5e8db12 100644 (file)
--- a/test/wifi-aware-publish-test.c
+++ b/test/wifi-aware-publish-test.c
@@ -569,8 +569,8 @@ void run_common()
 void clear_resources()
 {
        if (g_ndp) {
-               wifi_aware_data_path_destroy(g_ndp);
                wifi_aware_data_path_unset_terminated_cb(g_ndp);
+               wifi_aware_data_path_destroy(g_ndp);
        }
        g_ndp = NULL;
 
@@ -579,6 +579,7 @@ void clear_resources()
        g_publish_handle = NULL;
 
        if (g_wifi_aware_session) {
+               wifi_aware_session_stop(g_wifi_aware_session);
                wifi_aware_session_unset_message_received_cb(g_wifi_aware_session);
                wifi_aware_session_unset_terminated_cb(g_wifi_aware_session);
                wifi_aware_session_destroy(g_wifi_aware_session);

diff --git a/test/wifi-aware-subscribe-test.c b/test/wifi-aware-subscribe-test.c
index 316656c2469a9788d9eae655ea88b6e280afcd61..2e834d8b6375fae4c94f981106564c3bd1446794 100644 (file)
--- a/test/wifi-aware-subscribe-test.c
+++ b/test/wifi-aware-subscribe-test.c
@@ -640,8 +640,8 @@ void run_common()
 void clear_resources()
 {
        if (g_ndp) {
-               wifi_aware_data_path_destroy(g_ndp);
                wifi_aware_data_path_unset_terminated_cb(g_ndp);
+               wifi_aware_data_path_destroy(g_ndp);
        }
        g_ndp = NULL;