scottk/wlan-testing
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-testing.git synced 2025-11-02 03:48:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed the teardown logic in android tests

Browse Source 
Signed-off-by: haricharan-jaka <haricharan.jaka@candelatech.com>
This commit is contained in:
haricharan-jaka
2022-11-23 08:24:29 +05:30
parent 8b99f85c24
commit 150a57098d
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/perfecto_interop/android_tests.py
View File

@@ -57,10 +57,10 @@ class AndroidTests(android_libs):
ip_address = self.get_ip_address(ssid, setup, self.connData)
self.closeApp(self.connData["appPackage-android"], setup)
self.wifi_disconnect(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData)
self.teardown()
print(ip_address, ssid_with_internet)
if ip_address is not None:
return "PASS", "Device got the IP address"
self.teardown()
else:
self.teardown()
return "FAIL", "Device didn't get the IP address"
@@ -89,10 +89,10 @@ class AndroidTests(android_libs):
ip_address = self.get_ip_address(ssid, setup, self.connData)
self.closeApp(self.connData["appPackage-android"], setup)
self.wifi_disconnect(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData)
self.teardown()
print(ip_address, ssid_with_internet)
if ip_address is not None:
return "PASS", "Device got the IP address"
self.teardown()
else:
self.teardown()
return "FAIL", "Device didn't get the IP address"
@@ -119,9 +119,9 @@ class AndroidTests(android_libs):
self.closeApp(self.connData["appPackage-android"], setup)
down_speed, up_speed = self.speed_test(setup_perfecto_mobile)
self.wifi_disconnect(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData)
self.teardown()
if down_speed is not None and up_speed is not None:
return "PASS", "Device connected to SSID and ran Internet speed test"
self.teardown()
else:
self.teardown()
return "Fail", "Device didn't get connected to SSID"
@@ -144,15 +144,15 @@ class AndroidTests(android_libs):
setup_perfecto_mobile = self.setup_perfectoMobile[0]
try:
ssid_with_internet, setup, ssid_found = self.wifi_connect_eap(ssid=ssid, user=identity, passkey=ttls_passwd,
setup_perfectoMobile=setup_perfecto_mobile,
connData=self.connData)
setup_perfectoMobile=setup_perfecto_mobile,
connData=self.connData)
if ssid_with_internet is not None and ssid_found is True:
self.closeApp(self.connData["appPackage-android"], setup)
down_speed, up_speed = self.speed_test(setup_perfecto_mobile)
self.wifi_disconnect(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData)
self.teardown()
if down_speed is not None and up_speed is not None:
return "PASS", "Device connected to SSID and ran Internet speed test"
self.teardown()
else:
self.teardown()
return "Fail", "Device didn't get connected to SSID"
@@ -203,12 +203,13 @@ class AndroidTests(android_libs):
self.closeApp(self.connData["appPackage-android"], setup)
down_speed, up_speed = self.speed_test(setup_perfecto_mobile)
self.wifi_disconnect(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData)
self.teardown()
if down_speed is not None and up_speed is not None:
if float(down_speed) < float(down_rate) and float(up_speed) < float(up_rate):
return "PASS", "Device connected to SSID and ran rate-limiting test"
self.teardown()
else:
return "Fail", "Failed Rate-limiting test"
self.teardown()
else:
self.teardown()
return "Fail", "Device didn't get connected to SSID"
@@ -237,11 +238,12 @@ class AndroidTests(android_libs):
connData=self.connData)
self.closeApp(self.connData["appPackage-android"], setup)
self.wifi_disconnect(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData)
self.teardown()
if wifi_toggling is True:
return "PASS", "Connected to same ssid, after toggling the wifi button."
self.teardown()
else:
return "FAIL", "Not connected to same ssid, after toggling the wifi button."
self.teardown()
elif ssid_found is False:
self.teardown()
return "FAIL", "SSID is not seen in Device"
@@ -268,11 +270,12 @@ class AndroidTests(android_libs):
connData=self.connData)
self.closeApp(self.connData["appPackage-android"], setup)
self.wifi_disconnect(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData)
self.teardown()
if wifi_toggling is True:
return "PASS", "Connected to same ssid, after toggling the wifi button."
self.teardown()
else:
return "FAIL", "Not connected to same ssid, after toggling the wifi button."
self.teardown()
elif ssid_found is False:
self.teardown()
return "FAIL", "SSID is not seen in Device"

2
tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/test_general_security_modes.py
View File

@@ -182,7 +182,7 @@ class TestBridgeModeConnectSuiteA(object):
pytest -m "client_connect_tests and bridge and general and wpa2_personal and fiveg"
"""
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
ssid_name = "ssid_wpa2_2g_RL_NDF2716"
ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"]
security = "wpa2"
mode = "BRIDGE"