diff --git a/libs/perfecto_libs/iOS_lib.py b/libs/perfecto_libs/iOS_lib.py index 64c62fb56..e56bf39da 100644 --- a/libs/perfecto_libs/iOS_lib.py +++ b/libs/perfecto_libs/iOS_lib.py @@ -129,6 +129,7 @@ def set_APconnMobileDevice_iOS(WifiName, WifiPass, setup_perfectoMobile, connDat def Toggle_AirplaneMode_iOS(setup_perfectoMobile, connData): report = setup_perfectoMobile[1] driver = setup_perfectoMobile[0] + currentResult = True #Open Settings Application openApp(connData["bundleId-iOS-Settings"], setup_perfectoMobile) @@ -148,12 +149,13 @@ def Toggle_AirplaneMode_iOS(setup_perfectoMobile, connData): #ssertEqual(CellularMsgEle.text, "Airplane Mode", "Airplane Mode Not Triggerd") print("Verify Cellular Mode Text: Airplane Mode Success") except NoSuchElementException: - + currentResult = False print("Cellular Mode Not in Airplane Mode: ERROR") #Set Airplane Mode Back AirplaneMode.click() except NoSuchElementException: + currentResult = False print("Airplane Wifi Button not loaded...") #Verify No Sim Card Installed Msg Popup @@ -173,6 +175,8 @@ def Toggle_AirplaneMode_iOS(setup_perfectoMobile, connData): except NoSuchElementException: print("No Sim Card AlertMsg") + return currentResult + def verify_APconnMobileDevice_iOS(WifiName, setup_perfectoMobile, connData): report = setup_perfectoMobile[1] driver = setup_perfectoMobile[0] @@ -436,6 +440,7 @@ def verifyUploadDownloadSpeediOS(setup_perfectoMobile, get_APToMobileDevice_data report = setup_perfectoMobile[1] driver = setup_perfectoMobile[0] connData = get_APToMobileDevice_data + currentResult = True contexts = driver.contexts print("Printing Context") @@ -456,6 +461,7 @@ def verifyUploadDownloadSpeediOS(setup_perfectoMobile, get_APToMobileDevice_data elelSearch = driver.find_element_by_xpath("//*[@class='aajZCb']/li[1]/div[1]") elelSearch.click() except NoSuchElementException: + currentResult = False print("Search Drop Down not active...") print("Click Run Speed Test Button...") @@ -478,12 +484,11 @@ def verifyUploadDownloadSpeediOS(setup_perfectoMobile, get_APToMobileDevice_data except NoSuchElementException: print("Access Point Verification NOT Completed, checking Connection....") - - currentResult = True - - assert currentResult + currentResult = False except Exception as e: print (e.message) + + return currentResult \ No newline at end of file diff --git a/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py b/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py index 868d6bbce..63c352112 100644 --- a/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py +++ b/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py @@ -49,7 +49,7 @@ class TestToggleAirplaneMode(object): set_APconnMobileDevice_iOS(ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) #Toggle AirplaneMode - Toggle_AirplaneMode_iOS(setup_perfectoMobile_iOS, connData) + assert Toggle_AirplaneMode_iOS(setup_perfectoMobile_iOS, connData) #Verify AP After AirplaneMode assert verify_APconnMobileDevice_iOS(ssidName, setup_perfectoMobile_iOS, connData) diff --git a/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py b/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py index 0810804fd..88f0a7135 100644 --- a/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py +++ b/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py @@ -51,7 +51,7 @@ class TestPassPointConnection(object): set_APconnMobileDevice_iOS(ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) #Toggle Airplane Mode and Ensure Wifi Connection. - Toggle_AirplaneMode_iOS(setup_perfectoMobile_iOS, connData) + assert Toggle_AirplaneMode_iOS(setup_perfectoMobile_iOS, connData) #ForgetWifi ForgetWifiConnection(setup_perfectoMobile_iOS, ssidName, connData) diff --git a/tests/e2e/interOp/iOS/client_connectivity/test_NatMode.py b/tests/e2e/interOp/iOS/client_connectivity/test_NatMode.py index 540e7ac3b..09ee5fe4c 100644 --- a/tests/e2e/interOp/iOS/client_connectivity/test_NatMode.py +++ b/tests/e2e/interOp/iOS/client_connectivity/test_NatMode.py @@ -73,7 +73,7 @@ class TestNatMode(object): set_APconnMobileDevice_iOS(ssidName, ssidPassword, setup_perfectoMobileWeb, connData) #Verify Upload download Speed from device Selection - verifyUploadDownloadSpeediOS(setup_perfectoMobileWeb, connData) + assert verifyUploadDownloadSpeediOS(setup_perfectoMobileWeb, connData) #ForgetWifi ForgetWifiConnection(setup_perfectoMobileWeb, ssidName, connData)