tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wifi: Call terminate in VTS teardown

Browse source 
When OEM register different hostapd instance without update the StopHostapd.
It will cause VTS clean fail because hostapd process name is the new
one.
Call terminate to request clean HAL state.

Bug: 161682236
Bug: 167636313
Test: atest -c VtsHalWifiHostapdV1_2TargetTest
Test: atest -c VtsHalWifiHostapdV1_1TargetTest
Test: atest -c VtsHalWifiHostapdV1_0TargetTest
Change-Id: If56e5b5351abd31865150bdf97d27674dbbc4257
This commit is contained in:
lesl 2020-09-08 00:06:34 +08:00
parent 2c94e43016
commit 6f326efb0a
4 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wifi/hostapd/1.0/vts/functional/hostapd_hidl_call_util.h
View file

@ -95,6 +95,14 @@ typename functionArgSaver<CallbackT>::StorageT invokeMethod(
EXPECT_TRUE(res.isOk()); EXPECT_TRUE(res.isOk());
return result_buffer.saved_values; return result_buffer.saved_values;
} }
// Invokes |void method| on |object| without arguments.
template <typename MethodT, typename ObjectT>
void invokeVoidMethodWithoutArguments(MethodT method, ObjectT object) {
const auto& res = ((*object).*method)();
EXPECT_TRUE(res.isOk());
}
} // namespace detail } // namespace detail
} // namespace } // namespace
@ -123,3 +131,9 @@ typename functionArgSaver<CallbackT>::StorageT invokeMethod(
std::remove_reference<decltype(*strong_pointer)>::type::method##_cb>( \ std::remove_reference<decltype(*strong_pointer)>::type::method##_cb>( \
&std::remove_reference<decltype(*strong_pointer)>::type::method, \ &std::remove_reference<decltype(*strong_pointer)>::type::method, \
strong_pointer, ##__VA_ARGS__)) strong_pointer, ##__VA_ARGS__))
// Invokes |void method| on |strong_pointer| without arguments.
#define HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(strong_pointer, method) \
(detail::invokeVoidMethodWithoutArguments( \
&std::remove_reference<decltype(*strong_pointer)>::type::method, \
strong_pointer))

5
wifi/hostapd/1.0/vts/functional/hostapd_hidl_test.cpp
View file

@ -55,7 +55,10 @@ class HostapdHidlTest
ASSERT_NE(hostapd_.get(), nullptr); ASSERT_NE(hostapd_.get(), nullptr);
} }
virtual void TearDown() override { stopHostapd(wifi_instance_name_); } virtual void TearDown() override {
HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(hostapd_, terminate);
stopHostapd(wifi_instance_name_);
}
protected: protected:
std::string getPrimaryWlanIfaceName() { std::string getPrimaryWlanIfaceName() {

5
wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp
View file

@ -58,7 +58,10 @@ class HostapdHidlTest
ASSERT_NE(hostapd_.get(), nullptr); ASSERT_NE(hostapd_.get(), nullptr);
} }
virtual void TearDown() override { stopHostapd(wifi_instance_name_); } virtual void TearDown() override {
HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(hostapd_, terminate);
stopHostapd(wifi_instance_name_);
}
protected: protected:
std::string getPrimaryWlanIfaceName() { std::string getPrimaryWlanIfaceName() {

5
wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp
View file

@ -72,7 +72,10 @@ class HostapdHidlTest
"wifi_softap_wpa3_sae_supported"); "wifi_softap_wpa3_sae_supported");
} }
virtual void TearDown() override { stopHostapd(wifi_instance_name_); } virtual void TearDown() override {
HIDL_INVOKE_VOID_WITHOUT_ARGUMENTS(hostapd_, terminate);
stopHostapd(wifi_instance_name_);
}
protected: protected:
bool isWpa3SaeSupport_ = false; bool isWpa3SaeSupport_ = false;