Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afe3bbdc authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

[VTS][NAN] Fix VTS tests: didn't abort early enough for non-NAN devices am: 1acc63f9 

am: ba01f8ff

Change-Id: I3a85c77d662d9225a05214380d9544115f1351bd
parents 086107d9 ba01f8ff

wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -441,8 +441,8 @@ TEST_F(WifiChipHidlTest, RemoveApIface) { 
 * succeeds. The 2nd iface creation should be rejected.

 */

TEST_F(WifiChipHidlTest, CreateNanIface) {

    configureChipForIfaceType(IfaceType::NAN, gEnv->isNanOn);

    if (!gEnv->isNanOn) return;

    configureChipForIfaceType(IfaceType::NAN, gEnv->isNanOn);



    sp<IWifiNanIface> iface;

    ASSERT_EQ(WifiStatusCode::SUCCESS, createNanIface(&iface));
@@ -458,8 +458,8 @@ TEST_F(WifiChipHidlTest, CreateNanIface) { 
 * iface name is returned via the list.

 */

TEST_F(WifiChipHidlTest, GetNanIfaceNames) {

    configureChipForIfaceType(IfaceType::NAN, gEnv->isNanOn);

    if (!gEnv->isNanOn) return;

    configureChipForIfaceType(IfaceType::NAN, gEnv->isNanOn);



    const auto& status_and_iface_names1 =

        HIDL_INVOKE(wifi_chip_, getNanIfaceNames);
@@ -491,8 +491,8 @@ TEST_F(WifiChipHidlTest, GetNanIfaceNames) { 
 * doesn't retrieve an iface object.

 */

TEST_F(WifiChipHidlTest, GetNanIface) {

    configureChipForIfaceType(IfaceType::NAN, gEnv->isNanOn);

    if (!gEnv->isNanOn) return;

    configureChipForIfaceType(IfaceType::NAN, gEnv->isNanOn);



    sp<IWifiNanIface> nan_iface;

    EXPECT_EQ(WifiStatusCode::SUCCESS, createNanIface(&nan_iface));
@@ -518,8 +518,8 @@ TEST_F(WifiChipHidlTest, GetNanIface) { 
 * doesn't remove the iface.

 */

TEST_F(WifiChipHidlTest, RemoveNanIface) {

    configureChipForIfaceType(IfaceType::NAN, gEnv->isNanOn);

    if (!gEnv->isNanOn) return;

    configureChipForIfaceType(IfaceType::NAN, gEnv->isNanOn);



    sp<IWifiNanIface> nan_iface;

    EXPECT_EQ(WifiStatusCode::SUCCESS, createNanIface(&nan_iface));