Use correct import for TestResultRecord
Fix a typing issue where using antlion.records.TestResultRecord was
causing an error with mypy. The correct import comes from mobly.
Remove duplicated tests from WlanPhyComplianceABGTest:
- test_associate_11g_only_with_vendor_ie_in_assoc_correct_length
- test_associate_11g_only_with_vendor_ie_in_assoc_zero_length
Change-Id: I651b0bea8bb2c382dfa88a760446e181069b96f5
Reviewed-on: https://fuchsia-review.googlesource.com/c/antlion/+/865462
Fuchsia-Auto-Submit: Sam Balana <sbalana@google.com>
Reviewed-by: Karl Ward <karlward@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
diff --git a/tests/wlan/compliance/VapeInteropTest.py b/tests/wlan/compliance/VapeInteropTest.py
index b3f8490..07d9c07 100644
--- a/tests/wlan/compliance/VapeInteropTest.py
+++ b/tests/wlan/compliance/VapeInteropTest.py
@@ -15,12 +15,12 @@
# limitations under the License.
from mobly import asserts, test_runner
+from mobly.records import TestResultRecord
from antlion import utils
from antlion.controllers.access_point import setup_ap
from antlion.controllers.ap_lib import hostapd_constants
from antlion.controllers.ap_lib.hostapd_security import Security
-from antlion.records import TestResultRecord
from antlion.test_utils.abstract_devices.wlan_device import create_wlan_device
from antlion.test_utils.wifi import base_test
diff --git a/tests/wlan/compliance/WlanPhyCompliance11ACTest.py b/tests/wlan/compliance/WlanPhyCompliance11ACTest.py
index 21443b3..d1ed663 100644
--- a/tests/wlan/compliance/WlanPhyCompliance11ACTest.py
+++ b/tests/wlan/compliance/WlanPhyCompliance11ACTest.py
@@ -17,11 +17,11 @@
import itertools
from mobly import asserts, test_runner
+from mobly.records import TestResultRecord
from antlion.controllers.access_point import setup_ap
from antlion.controllers.ap_lib import hostapd_constants
from antlion.controllers.ap_lib.hostapd_security import Security
-from antlion.records import TestResultRecord
from antlion.test_utils.abstract_devices.wlan_device import create_wlan_device
from antlion.test_utils.wifi import base_test
from antlion.utils import rand_ascii_str
diff --git a/tests/wlan/compliance/WlanPhyCompliance11NTest.py b/tests/wlan/compliance/WlanPhyCompliance11NTest.py
index 58bdd99..9e3e783 100644
--- a/tests/wlan/compliance/WlanPhyCompliance11NTest.py
+++ b/tests/wlan/compliance/WlanPhyCompliance11NTest.py
@@ -17,13 +17,13 @@
import itertools
from mobly import asserts, test_runner
+from mobly.records import TestResultRecord
from antlion import utils
from antlion.controllers.access_point import setup_ap
from antlion.controllers.ap_lib import hostapd_config, hostapd_constants
from antlion.controllers.ap_lib.hostapd_security import Security
from antlion.controllers.ap_lib.hostapd_utils import generate_random_password
-from antlion.records import TestResultRecord
from antlion.test_utils.abstract_devices.wlan_device import create_wlan_device
from antlion.test_utils.wifi import base_test
diff --git a/tests/wlan/compliance/WlanPhyComplianceABGTest.py b/tests/wlan/compliance/WlanPhyComplianceABGTest.py
index cd70ac6..69a34d0 100644
--- a/tests/wlan/compliance/WlanPhyComplianceABGTest.py
+++ b/tests/wlan/compliance/WlanPhyComplianceABGTest.py
@@ -15,11 +15,11 @@
# limitations under the License.
from mobly import asserts, test_runner
+from mobly.records import TestResultRecord
from antlion import utils
from antlion.controllers.access_point import setup_ap
from antlion.controllers.ap_lib import hostapd_constants
-from antlion.records import TestResultRecord
from antlion.test_utils.abstract_devices.wlan_device import create_wlan_device
from antlion.test_utils.wifi import base_test
@@ -1734,43 +1734,6 @@
self.dut.associate(self.open_network_2g["SSID"]), "Failed to associate."
)
- def test_associate_11g_only_with_vendor_ie_in_assoc_correct_length(self):
- data_rates = utils.merge_dicts(
- hostapd_constants.OFDM_DATA_RATES,
- hostapd_constants.OFDM_ONLY_BASIC_RATES,
- hostapd_constants.VENDOR_IE["correct_length_association_response"],
- )
- setup_ap(
- access_point=self.access_point,
- profile_name="whirlwind_11ag_legacy",
- channel=hostapd_constants.AP_DEFAULT_CHANNEL_2G,
- ssid=self.open_network_2g["SSID"],
- additional_ap_parameters=data_rates,
- )
- asserts.assert_true(
- self.dut.associate(self.open_network_2g["SSID"]), "Failed to associate."
- )
-
- def test_associate_11g_only_with_vendor_ie_in_assoc_zero_length(self):
- data_rates = utils.merge_dicts(
- hostapd_constants.OFDM_DATA_RATES,
- hostapd_constants.OFDM_ONLY_BASIC_RATES,
- hostapd_constants.VENDOR_IE["correct_length_association_response"],
- hostapd_constants.VENDOR_IE[
- "zero_length_association_" "response_without_data"
- ],
- )
- setup_ap(
- access_point=self.access_point,
- profile_name="whirlwind_11ag_legacy",
- channel=hostapd_constants.AP_DEFAULT_CHANNEL_2G,
- ssid=self.open_network_2g["SSID"],
- additional_ap_parameters=data_rates,
- )
- asserts.assert_true(
- self.dut.associate(self.open_network_2g["SSID"]), "Failed to associate."
- )
-
def test_minimum_ssid_length_2g_11n_20mhz(self):
setup_ap(
access_point=self.access_point,
