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

Commit ea58fdb6 authored by Robert Chou's avatar Robert Chou Committed by android-build-merger
Browse files

Merge "hostapd: Ignore ACS relate vts testcase for hostapd 1.0 and hostapd... 

Merge "hostapd: Ignore ACS relate vts testcase for hostapd 1.0 and hostapd 1.1" into qt-dev am: e9e40205
am: 6059e56d

Change-Id: If56d6f3d4f8cb22e8702b0225f292a064cffdf7d
parents 6c232ced 6059e56d

wifi/hostapd/1.0/vts/functional/hostapd_hidl_test.cpp

+7 −2
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ TEST_F(HostapdHidlTest, AddPskAccessPointWithAcs) { 
    if (!is_1_1(hostapd_)) {

        auto status = HIDL_INVOKE(hostapd_, addAccessPoint,

                                  getIfaceParamsWithAcs(), getPskNwParams());

        EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

        // TODO: b/140172237, fix this in R

        // EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

    }

}
@@ -154,7 +155,8 @@ TEST_F(HostapdHidlTest, AddOpenAccessPointWithAcs) { 
    if (!is_1_1(hostapd_)) {

        auto status = HIDL_INVOKE(hostapd_, addAccessPoint,

                                  getIfaceParamsWithAcs(), getOpenNwParams());

        EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

        // TODO: b/140172237, fix this in R

        // EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

    }

}
@@ -191,10 +193,13 @@ TEST_F(HostapdHidlTest, RemoveAccessPointWithAcs) { 
    if (!is_1_1(hostapd_)) {

        auto status = HIDL_INVOKE(hostapd_, addAccessPoint,

                                  getIfaceParamsWithAcs(), getPskNwParams());

        // TODO: b/140172237, fix this in R

        /*

        EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

        status =

            HIDL_INVOKE(hostapd_, removeAccessPoint, getPrimaryWlanIfaceName());

        EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

        */

    }

}

wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp

+11 −4
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ TEST_F(HostapdHidlTest, registerCallback) { 
TEST_F(HostapdHidlTest, AddPskAccessPointWithAcs) {

    auto status = HIDL_INVOKE(hostapd_, addAccessPoint_1_1,

                              getIfaceParamsWithAcs(), getPskNwParams());

    EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

    // TODO: b/140172237, fix this in R.

    // EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

}



/**
@@ -189,7 +190,8 @@ TEST_F(HostapdHidlTest, AddPskAccessPointWithAcsAndChannelRange) { 
    auto status =

        HIDL_INVOKE(hostapd_, addAccessPoint_1_1,

                    getIfaceParamsWithAcsAndChannelRange(), getPskNwParams());

    EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

    // TODO: b/140172237, fix this in R

    // EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

}



/**
@@ -200,7 +202,8 @@ TEST_F(HostapdHidlTest, AddPskAccessPointWithAcsAndInvalidChannelRange) { 
    auto status = HIDL_INVOKE(hostapd_, addAccessPoint_1_1,

                              getIfaceParamsWithAcsAndInvalidChannelRange(),

                              getPskNwParams());

    EXPECT_NE(HostapdStatusCode::SUCCESS, status.code);

    // TODO: b/140172237, fix this in R

    // EXPECT_NE(HostapdStatusCode::SUCCESS, status.code);

}



/**
@@ -210,7 +213,8 @@ TEST_F(HostapdHidlTest, AddPskAccessPointWithAcsAndInvalidChannelRange) { 
TEST_F(HostapdHidlTest, AddOpenAccessPointWithAcs) {

    auto status = HIDL_INVOKE(hostapd_, addAccessPoint_1_1,

                              getIfaceParamsWithAcs(), getOpenNwParams());

    EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

    // TODO: b/140172237, fix this in R

    // EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

}



/**
@@ -240,10 +244,13 @@ TEST_F(HostapdHidlTest, AddOpenAccessPointWithoutAcs) { 
TEST_F(HostapdHidlTest, RemoveAccessPointWithAcs) {

    auto status = HIDL_INVOKE(hostapd_, addAccessPoint_1_1,

                              getIfaceParamsWithAcs(), getPskNwParams());

    // TODO: b/140172237, fix this in R

    /*

    EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

    status =

        HIDL_INVOKE(hostapd_, removeAccessPoint, getPrimaryWlanIfaceName());

    EXPECT_EQ(HostapdStatusCode::SUCCESS, status.code);

    */

}



/**