From 03e0cb23ef643599d2fd5e82fd13a89e01f897d6 Mon Sep 17 00:00:00 2001 From: Saurabh Goyal Date: Wed, 21 Jul 2021 18:33:14 +0530 Subject: [PATCH 1/8] Add fail safe if ssid is not broadcasted by AP for ToggleAirplaneMode Signed-off-by: Saurabh Goyal --- .../AirplaneMode/test_ToggleAirplaneMode.py | 53 +++++++++++++------ 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py b/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py index 43e55391e..c6d1ef0dc 100644 --- a/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py +++ b/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py @@ -19,20 +19,24 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, Toggle_AirplaneMode_iOS, ForgetWifiConnection, set_APconnMobileDevice_iOS, \ verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown -pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.ToggleAirplaneMode] +pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, + pytest.mark.ToggleAirplaneMode] setup_params_general = { "mode": "NAT", "ssid_modes": { "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],"security_key": "something"}], + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}], "wpa2_personal": [ {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],"security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } + @allure.feature("NAT MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', @@ -40,28 +44,32 @@ setup_params_general = { indirect=True, scope="class" ) - @pytest.mark.usefixtures("setup_profiles") class TestToggleAirplaneMode(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ToogleAirplaneMode_5g_WPA2_Personal(self, request, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): + def test_ToogleAirplaneMode_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, + setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print("SSID_NAME: " + ssidName) print("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - #print("ReportFlag: " + resultFlag) - #setReportResultFlag(resultFlag) - + # print("ReportFlag: " + resultFlag) + # setReportResultFlag(resultFlag) + # Toggle AirplaneMode Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) @@ -73,23 +81,28 @@ class TestToggleAirplaneMode(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ToogleAirplaneMode_2g_WPA2_Personal(self, request, get_ToggleAirplaneMode_data,setup_perfectoMobile_iOS): + def test_ToogleAirplaneMode_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, + setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print("SSID_NAME: " + ssidName) print("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - #print("ResultFlag: " + resultFlag) - # print(resultFlag) - # reportResultFlag.reportFlag = resultFlag - + # print("ResultFlag: " + resultFlag) + # print(resultFlag) + # reportResultFlag.reportFlag = resultFlag + # Toggle AirplaneMode Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) @@ -101,13 +114,18 @@ class TestToggleAirplaneMode(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ToogleAirplaneMode_5g_WPA(self, request, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): + def test_ToogleAirplaneMode_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, + setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print("SSID_NAME: " + ssidName) print("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_ToggleAirplaneMode_data @@ -126,13 +144,18 @@ class TestToggleAirplaneMode(object): @pytest.mark.twog @pytest.mark.wpa - def test_ToogleAirplaneMode_2g_WPA(self, request, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): + def test_ToogleAirplaneMode_2g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, + setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print("SSID_NAME: " + ssidName) print("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_ToggleAirplaneMode_data From acca6befe6d4accc734f25db5c657874e8c0a77f Mon Sep 17 00:00:00 2001 From: Saurabh Goyal Date: Wed, 21 Jul 2021 18:48:16 +0530 Subject: [PATCH 2/8] - Add fail safe if ssid is not broadcasted by AP for ToggleAirplaneMode Signed-off-by: Saurabh Goyal --- .../iOS/PassPoint/test_PassPointConnection.py | 105 ++++++++++------- .../iOS/WifiMode/test_ToggleWifiMode.py | 106 +++++++++++------- 2 files changed, 127 insertions(+), 84 deletions(-) diff --git a/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py b/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py index fbad67ddd..79233b2c9 100644 --- a/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py +++ b/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py @@ -28,11 +28,13 @@ setup_params_general = { {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],"security_key": "something"}], "wpa2_personal": [ {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],"security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } + @allure.feature("NAT MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', @@ -40,110 +42,129 @@ setup_params_general = { indirect=True, scope="class" ) - @pytest.mark.usefixtures("setup_profiles") class TestPassPointConnection(object): - + @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_PassPointConnection_5g_WPA2_Personal(self, request, setup_perfectoMobile_iOS, get_PassPointConniOS_data): - - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + def test_PassPointConnection_5g_WPA2_Personal(self, request, get_vif_state, setup_perfectoMobile_iOS, + get_PassPointConniOS_data): + + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] - print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + print("SSID_NAME: " + ssidName) + print("SSID_PASS: " + ssidPassword) + + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_PassPointConniOS_data - #Set Wifi Access Mode to #Default-SSID-5gl-perfecto-b/#Default-SSID-2gl-perfecto-b + # Set Wifi Access Mode to #Default-SSID-5gl-perfecto-b/#Default-SSID-2gl-perfecto-b set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - #Toggle Airplane Mode and Ensure Wifi Connection. + # Toggle Airplane Mode and Ensure Wifi Connection. assert Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - #ForgetWifi + # ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) - #Close Settings App + # Close Settings App closeApp(connData["bundleId-iOS-Settings"], setup_perfectoMobile_iOS) @pytest.mark.twog @pytest.mark.wpa2_personal - def test_PassPointConnection_2g_WPA2_Personal(self, request, setup_perfectoMobile_iOS, get_PassPointConniOS_data): - - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + def test_PassPointConnection_2g_WPA2_Personal(self, request, get_vif_state, setup_perfectoMobile_iOS, + get_PassPointConniOS_data): + + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] - ssidPassword = profile_data["security_key"] - print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + ssidPassword = profile_data["security_key"] + print("SSID_NAME: " + ssidName) + print("SSID_PASS: " + ssidPassword) + + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_PassPointConniOS_data - #Set Wifi Access Mode to #Default-SSID-5gl-perfecto-b/#Default-SSID-2gl-perfecto-b + # Set Wifi Access Mode to #Default-SSID-5gl-perfecto-b/#Default-SSID-2gl-perfecto-b set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - #Toggle Airplane Mode and Ensure Wifi Connection. + # Toggle Airplane Mode and Ensure Wifi Connection. Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - #ForgetWifi + # ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) - #Close Settings App + # Close Settings App closeApp(connData["bundleId-iOS-Settings"], setup_perfectoMobile_iOS) @pytest.mark.twog @pytest.mark.wpa - def test_PassPointConnection_2g_WPA(self, request, setup_perfectoMobile_iOS, get_PassPointConniOS_data): - + def test_PassPointConnection_2g_WPA(self, request, get_vif_state, setup_perfectoMobile_iOS, + get_PassPointConniOS_data): + profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] - ssidPassword = profile_data["security_key"] - print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + ssidPassword = profile_data["security_key"] + print("SSID_NAME: " + ssidName) + print("SSID_PASS: " + ssidPassword) + + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_PassPointConniOS_data - #Set Wifi Access Mode to #Default-SSID-5gl-perfecto-b/#Default-SSID-2gl-perfecto-b + # Set Wifi Access Mode to #Default-SSID-5gl-perfecto-b/#Default-SSID-2gl-perfecto-b set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - #Toggle Airplane Mode and Ensure Wifi Connection. + # Toggle Airplane Mode and Ensure Wifi Connection. Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - #ForgetWifi + # ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) - #Close Settings App + # Close Settings App closeApp(connData["bundleId-iOS-Settings"], setup_perfectoMobile_iOS) @pytest.mark.fiveg @pytest.mark.wpa - def test_PassPointConnection_5g_WPA(self, request, setup_perfectoMobile_iOS, get_PassPointConniOS_data): - - profile_data = setup_params_general["ssid_modes"]["wpa"][1] + def test_PassPointConnection_5g_WPA(self, request, get_vif_state, setup_perfectoMobile_iOS, + get_PassPointConniOS_data): + + profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] - ssidPassword = profile_data["security_key"] - print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + ssidPassword = profile_data["security_key"] + print("SSID_NAME: " + ssidName) + print("SSID_PASS: " + ssidPassword) + + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_PassPointConniOS_data - #Set Wifi Access Mode to #Default-SSID-5gl-perfecto-b/#Default-SSID-2gl-perfecto-b + # Set Wifi Access Mode to #Default-SSID-5gl-perfecto-b/#Default-SSID-2gl-perfecto-b set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - #Toggle Airplane Mode and Ensure Wifi Connection. + # Toggle Airplane Mode and Ensure Wifi Connection. Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - #ForgetWifi + # ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) - - #Close Settings App + + # Close Settings App closeApp(connData["bundleId-iOS-Settings"], setup_perfectoMobile_iOS) \ No newline at end of file diff --git a/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py b/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py index 12cec3858..178cd61b1 100644 --- a/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py +++ b/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py @@ -16,22 +16,27 @@ import allure if 'perfecto_libs' not in sys.path: sys.path.append(f'../libs/perfecto_libs') -pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.ToggleWifiMode] +pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, + pytest.mark.ToggleWifiMode] -from iOS_lib import closeApp, openApp, Toggle_AirplaneMode_iOS, ForgetWifiConnection, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown +from iOS_lib import closeApp, openApp, Toggle_AirplaneMode_iOS, ForgetWifiConnection, set_APconnMobileDevice_iOS, \ + verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown setup_params_general = { "mode": "NAT", "ssid_modes": { "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],"security_key": "something"}], + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}], "wpa2_personal": [ {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],"security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } + @allure.feature("NAT MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', @@ -39,114 +44,131 @@ setup_params_general = { indirect=True, scope="class" ) - @pytest.mark.usefixtures("setup_profiles") class TestToggleWifiMode(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ToogleWifiMode_5g_WPA2_Personal(self, request, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): - + def test_ToogleWifiMode_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleWifiMode_data, + setup_perfectoMobile_iOS): + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] - print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + print("SSID_NAME: " + ssidName) + print("SSID_PASS: " + ssidPassword) + + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_ToggleWifiMode_data - #Set Wifi/AP Mode + # Set Wifi/AP Mode set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - #Toggle WifiMode + # Toggle WifiMode Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - - #Verify AP After AirplaneMode + + # Verify AP After AirplaneMode value = verify_APconnMobileDevice_iOS(request, ssidName, setup_perfectoMobile_iOS, connData) assert value - #ForgetWifi + # ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ToogleWifiMode_2g_WPA2_Personal(self, request,get_ToggleWifiMode_data, setup_perfectoMobile_iOS): - + def test_ToogleWifiMode_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleWifiMode_data, + setup_perfectoMobile_iOS): + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] - print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + print("SSID_NAME: " + ssidName) + print("SSID_PASS: " + ssidPassword) + + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_ToggleWifiMode_data - #Set Wifi/AP Mode + # Set Wifi/AP Mode set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - #Toggle WifiMode + # Toggle WifiMode Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - - #Verify AP After AirplaneMode + + # Verify AP After AirplaneMode value = verify_APconnMobileDevice_iOS(request, ssidName, setup_perfectoMobile_iOS, connData) assert value - #ForgetWifi + # ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) @pytest.mark.fiveg @pytest.mark.wpa - def test_ToogleWifiMode_5g_WPA(self, request, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): - - profile_data = setup_params_general["ssid_modes"]["wpa"][1] + def test_ToogleWifiMode_5g_WPA(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): + + profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] - print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + print("SSID_NAME: " + ssidName) + print("SSID_PASS: " + ssidPassword) + + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_ToggleWifiMode_data - #Set Wifi/AP Mode + # Set Wifi/AP Mode set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - #Toggle WifiMode + # Toggle WifiMode Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - - #Verify AP After AirplaneMode + + # Verify AP After AirplaneMode value = verify_APconnMobileDevice_iOS(request, ssidName, setup_perfectoMobile_iOS, connData) assert value - #ForgetWifi + # ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) @pytest.mark.twog @pytest.mark.wpa - def test_ToogleWifiMode_2g_WPA(self, request, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): - + def test_ToogleWifiMode_2g_WPA(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): + profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] - print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + print("SSID_NAME: " + ssidName) + print("SSID_PASS: " + ssidPassword) + + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_ToggleWifiMode_data - #Set Wifi/AP Mode + # Set Wifi/AP Mode set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - #Toggle WifiMode + # Toggle WifiMode Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - - #Verify AP After AirplaneMode + + # Verify AP After AirplaneMode value = verify_APconnMobileDevice_iOS(request, ssidName, setup_perfectoMobile_iOS, connData) assert value - #ForgetWifi + # ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) \ No newline at end of file From ae92da52cfe3f6f5c9548044551d2b839b3aafc7 Mon Sep 17 00:00:00 2001 From: haricharan-jaka Date: Wed, 21 Jul 2021 19:15:41 +0530 Subject: [PATCH 3/8] Added fail safe if ssid is not being broadcasted by Ap --- .../test_AccessPointConnection.py | 24 +++++++++++++++---- .../iOS/client_connectivity/test_NatMode.py | 23 ++++++++++++++---- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py b/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py index e54dbc8b6..b69fddcee 100644 --- a/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py +++ b/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py @@ -46,7 +46,7 @@ class TestAccessPointConnectivety(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_AccessPointConnection_5g_WPA2_Personal(self, request, get_AccessPointConn_data, setup_perfectoMobile_iOS): + def test_AccessPointConnection_5g_WPA2_Personal(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] @@ -55,6 +55,10 @@ class TestAccessPointConnectivety(object): print ("SSID_NAME: " + ssidName) print ("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_AccessPointConn_data @@ -75,13 +79,17 @@ class TestAccessPointConnectivety(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_AccessPointConnection_2g_WPA2_Personal(self, request, get_AccessPointConn_data, setup_perfectoMobile_iOS): + def test_AccessPointConnection_2g_WPA2_Personal(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) print ("SSID_PASS: " + ssidPassword) + + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] @@ -101,15 +109,20 @@ class TestAccessPointConnectivety(object): #ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) + @pytest.mark.fiveg @pytest.mark.wpa - def test_AccessPointConnection_5g_WPA(self, request, get_AccessPointConn_data, setup_perfectoMobile_iOS): + def test_AccessPointConnection_5g_WPA(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) print ("SSID_PASS: " + ssidPassword) + + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] @@ -131,13 +144,16 @@ class TestAccessPointConnectivety(object): @pytest.mark.twog @pytest.mark.wpa - def test_AccessPointConnection_2g_WPA(self, request, get_AccessPointConn_data, setup_perfectoMobile_iOS): + def test_AccessPointConnection_2g_WPA(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) print ("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] diff --git a/tests/e2e/interOp/iOS/client_connectivity/test_NatMode.py b/tests/e2e/interOp/iOS/client_connectivity/test_NatMode.py index 48d96ff48..406764b19 100644 --- a/tests/e2e/interOp/iOS/client_connectivity/test_NatMode.py +++ b/tests/e2e/interOp/iOS/client_connectivity/test_NatMode.py @@ -45,7 +45,7 @@ class TestNatMode(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ClientConnectivity_5g_WPA2_Personal(self, request, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] @@ -53,6 +53,10 @@ class TestNatMode(object): print ("SSID_NAME: " + ssidName) print ("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_APToMobileDevice_data @@ -66,15 +70,19 @@ class TestNatMode(object): #ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) + @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ClientConnectivity_2g_WPA2_Personal(self, request, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) print ("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] @@ -89,15 +97,19 @@ class TestNatMode(object): #ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) + @pytest.mark.twog @pytest.mark.wpa - def test_ClientConnectivity_2g_WPA(self, request, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) print ("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] @@ -114,13 +126,16 @@ class TestNatMode(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ClientConnectivity_5g_WPA(self, request, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) print ("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] From cd9ac572365cde79256e206ecfa33d7a943c02c5 Mon Sep 17 00:00:00 2001 From: Saurabh Goyal Date: Wed, 21 Jul 2021 19:32:42 +0530 Subject: [PATCH 4/8] stagging-wifi-3060 --- tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py b/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py index c6d1ef0dc..85e784f89 100644 --- a/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py +++ b/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py @@ -165,7 +165,7 @@ class TestToggleAirplaneMode(object): # Toggle AirplaneMode Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - + #sg # Verify AP After AirplaneMode assert verify_APconnMobileDevice_iOS(request, ssidName, setup_perfectoMobile_iOS, connData) From 85df2f994dbac83450593629544a8ad9f06051d6 Mon Sep 17 00:00:00 2001 From: Saurabh Goyal Date: Thu, 22 Jul 2021 17:19:45 +0530 Subject: [PATCH 5/8] Add fail safe if ssid is not being broadcasted by AP for ToggleAirplaneMode Signed-off-by: Saurabh Goyal --- tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py b/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py index 85e784f89..c6d1ef0dc 100644 --- a/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py +++ b/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py @@ -165,7 +165,7 @@ class TestToggleAirplaneMode(object): # Toggle AirplaneMode Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - #sg + # Verify AP After AirplaneMode assert verify_APconnMobileDevice_iOS(request, ssidName, setup_perfectoMobile_iOS, connData) From a8347b52e2f7ad095c24c99802b665bf06d5c755 Mon Sep 17 00:00:00 2001 From: Saurabh Goyal Date: Thu, 22 Jul 2021 22:31:51 +0530 Subject: [PATCH 6/8] Add fail safe if ssid is not being broadcasted by AP for PassPointConnection.py Signed-off-by: Saurabh Goyal --- tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py b/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py index 79233b2c9..e0c2bf562 100644 --- a/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py +++ b/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py @@ -95,7 +95,7 @@ class TestPassPointConnection(object): driver = setup_perfectoMobile_iOS[0] connData = get_PassPointConniOS_data - # Set Wifi Access Mode to #Default-SSID-5gl-perfecto-b/#Default-SSID-2gl-perfecto-b + # Set Wifi Access Mode to #Default-SSID-5gl-perfecto-b/#Default-SSID-2gl-perfecto-b. set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # Toggle Airplane Mode and Ensure Wifi Connection. From 839362d3fbc48d5c7b3740ce2608975bdbfa5fdd Mon Sep 17 00:00:00 2001 From: Saurabh Goyal Date: Thu, 22 Jul 2021 22:38:03 +0530 Subject: [PATCH 7/8] Add fail safe if ssid is not being brodcasted by AP for PassPoint Signed-off-by: Saurabh Goyal --- tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py b/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py index e0c2bf562..a7e5b269a 100644 --- a/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py +++ b/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py @@ -104,7 +104,7 @@ class TestPassPointConnection(object): # ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) - # Close Settings App + # Close Settings App. closeApp(connData["bundleId-iOS-Settings"], setup_perfectoMobile_iOS) @pytest.mark.twog From 448657e8c7f994ca7ab01f296ff051689910ac7b Mon Sep 17 00:00:00 2001 From: Saurabh Goyal Date: Thu, 22 Jul 2021 22:41:22 +0530 Subject: [PATCH 8/8] Add fail safe if ssid is not being brodcasted by AP for WifiMode-IOS Signed-off-by: Saurabh Goyal --- tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py b/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py index 178cd61b1..d2da4cd90 100644 --- a/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py +++ b/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py @@ -101,14 +101,14 @@ class TestToggleWifiMode(object): # Set Wifi/AP Mode set_APconnMobileDevice_iOS(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) - # Toggle WifiMode + # Toggle WifiMode. Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - # Verify AP After AirplaneMode + # Verify AP After AirplaneMode. value = verify_APconnMobileDevice_iOS(request, ssidName, setup_perfectoMobile_iOS, connData) assert value - # ForgetWifi + # ForgetWifi. ForgetWifiConnection(request, setup_perfectoMobile_iOS, ssidName, connData) @pytest.mark.fiveg