From 7f3bd1792f35bc9319a6daea9ff22796df9a8220 Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Thu, 20 Apr 2023 16:10:37 -0700
Subject: [PATCH] Fix broken and flaky VTS tests

nvResetConfig takes some time to reset the modem, causing subsequent
tests to fail with a timeout since the modem is unavailabe.
Add a timeout after nvResetConfig to allow the modem to be up again
before running the next test.

Bug: 259674407
Test: atest VtsHalRadioTargetTest
Change-Id: Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6
Merged-In: Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6
(cherry picked from commit ddaea2e5a4cca53319a3cb61974c03fc32b50930)
---
 radio/1.0/vts/functional/radio_hidl_hal_misc.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
index 624d00381f..ee8b4dcb95 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
@@ -654,6 +654,8 @@ TEST_P(RadioHidlTest, nvResetConfig) {
         ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,
                                      {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));
     }
+    // wait until modem reset finishes
+    sleep(10);
     LOG(DEBUG) << "nvResetConfig finished";
 }