wifi(vts): Don't enforce interface combination in VTS tests

Devices are allowed to expose multiple AP or STA interfaces, fix the VTS
tests to allow this.

Bug: 112123615
Test: Compiles
Change-Id: I6cf60b3cb0429ca78fe5a54d9e42ba144d7609e9
This commit is contained in:
Roshan Pius
2018-08-21 14:05:21 -07:00
parent e1704f3fd6
commit f638d0a43a

View File

@@ -348,8 +348,8 @@ TEST_F(WifiChipHidlTest, GetDebugHostWakeReasonStats) {
/*
* CreateApIface
* Configures the chip in AP mode and ensures that only 1 iface creation
* succeeds. The 2nd iface creation should be rejected.
* Configures the chip in AP mode and ensures that at least 1 iface creation
* succeeds.
*/
TEST_F(WifiChipHidlTest, CreateApIface) {
configureChipForIfaceType(IfaceType::AP, true);
@@ -357,8 +357,6 @@ TEST_F(WifiChipHidlTest, CreateApIface) {
sp<IWifiApIface> iface;
EXPECT_EQ(WifiStatusCode::SUCCESS, createApIface(&iface));
EXPECT_NE(nullptr, iface.get());
EXPECT_EQ(WifiStatusCode::ERROR_NOT_AVAILABLE, createApIface(&iface));
}
/*
@@ -443,8 +441,8 @@ TEST_F(WifiChipHidlTest, RemoveApIface) {
/*
* CreateNanIface
* Configures the chip in NAN mode and ensures that only 1 iface creation
* succeeds. The 2nd iface creation should be rejected.
* Configures the chip in NAN mode and ensures that at least 1 iface creation
* succeeds.
*/
TEST_F(WifiChipHidlTest, CreateNanIface) {
if (!gEnv->isNanOn) return;
@@ -453,8 +451,6 @@ TEST_F(WifiChipHidlTest, CreateNanIface) {
sp<IWifiNanIface> iface;
ASSERT_EQ(WifiStatusCode::SUCCESS, createNanIface(&iface));
EXPECT_NE(nullptr, iface.get());
EXPECT_EQ(WifiStatusCode::ERROR_NOT_AVAILABLE, createNanIface(&iface));
}
/*
@@ -543,8 +539,8 @@ TEST_F(WifiChipHidlTest, RemoveNanIface) {
/*
* CreateP2pIface
* Configures the chip in P2P mode and ensures that only 1 iface creation
* succeeds. The 2nd iface creation should be rejected.
* Configures the chip in P2P mode and ensures that at least 1 iface creation
* succeeds.
*/
TEST_F(WifiChipHidlTest, CreateP2pIface) {
configureChipForIfaceType(IfaceType::P2P, true);
@@ -552,8 +548,6 @@ TEST_F(WifiChipHidlTest, CreateP2pIface) {
sp<IWifiP2pIface> iface;
EXPECT_EQ(WifiStatusCode::SUCCESS, createP2pIface(&iface));
EXPECT_NE(nullptr, iface.get());
EXPECT_EQ(WifiStatusCode::ERROR_NOT_AVAILABLE, createP2pIface(&iface));
}
/*
@@ -638,8 +632,8 @@ TEST_F(WifiChipHidlTest, RemoveP2pIface) {
/*
* CreateStaIface
* Configures the chip in STA mode and ensures that only 1 iface creation
* succeeds. The 2nd iface creation should be rejected.
* Configures the chip in STA mode and ensures that at least 1 iface creation
* succeeds.
*/
TEST_F(WifiChipHidlTest, CreateStaIface) {
configureChipForIfaceType(IfaceType::STA, true);
@@ -647,8 +641,6 @@ TEST_F(WifiChipHidlTest, CreateStaIface) {
sp<IWifiStaIface> iface;
EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&iface));
EXPECT_NE(nullptr, iface.get());
EXPECT_EQ(WifiStatusCode::ERROR_NOT_AVAILABLE, createStaIface(&iface));
}
/*