Merge pull request #265 from Telecominfraproject/WIFI-4163

Wifi 4163

libs/perfecto_libs/android_lib.py

@@ -2682,3 +2682,14 @@ def wifi_connect_eap(request, WifiName, User, ttls_passwd, setup_perfectoMobile,
 def close_driver(driver):
     driver.close()
     driver.quit()
+
+# def capture_start_har(setup_perfectoMobile):
+#     setup_perfectoMobile[1].step_start("Start HAR capture on Phone...")
+#     # params = {'generateHarFile', 'true'}
+#     params = {'generateHarFile' : 'true'}
+#     setup_perfectoMobile[0].execute_script('mobile:vnetwork:start', params)
+#
+# def capture_stop_har(setup_perfectoMobile):
+#     setup_perfectoMobile[1].step_start("Stop HAR capture on Phone...")
+#     params = {'generateHarFile' : 'true'}
+#     setup_perfectoMobile[0].execute_script('mobile:vnetwork:stop', params)

tests/e2e/interOp/conftest.py

@@ -10,6 +10,7 @@ from perfecto import (PerfectoExecutionContext, PerfectoReportiumClient, TestCon
 import pytest
 import logging
 import re
+import allure
 
 sys.path.append(
     os.path.dirname(
@@ -423,10 +424,27 @@ def setup_perfectoMobile_android(request):
     reporting_client.test_start(testCaseName, TestContext([], "Perforce"))
     reportClient(reporting_client)
 
+    try:
+        params = {'property': 'model'}
+        deviceModel = driver.execute_script('mobile:handset:info', params)
+        device_name_list.append(deviceModel)
+    except:
+        pass
+
     def teardown():
         try:
             print("\n---------- Tear Down ----------")
+            try:
+                params = {'property': 'model'}
+                deviceModel = driver.execute_script('mobile:handset:info', params)
+                allure.dynamic.link(
+                    str(reporting_client.report_url()),
+                    name=str(deviceModel))
+            except:
+                print("fail to attach video link")
+
             print('Report-Url: ' + reporting_client.report_url())
+
             print("----------------------------------------------------------\n\n\n\n")
             driver.close()
         except Exception as e:
@@ -573,11 +591,23 @@ def setup_perfectoMobile_iOS(request):
     reporting_client = PerfectoReportiumClient(perfecto_execution_context)
     reporting_client.test_start(testCaseName, TestContext([], "Perforce"))
     reportClient(reporting_client)
+    try:
+        params = {'property': 'model'}
+        deviceModel = driver.execute_script('mobile:handset:info', params)
+        device_name_list.append(deviceModel)
+    except:
+        pass
 
     def teardown():
         try:
             print("\n---------- Tear Down ----------")
             print('Report-Url: ' + reporting_client.report_url())
+            try:
+                allure.dynamic.link(
+                    str(reporting_client.report_url()),
+                    name=str(deviceModel))
+            except:
+                print("fail to attach video link")
             print("----------------------------------------------------------\n\n\n\n")
             driver.close()
         except Exception as e:

tests/pytest.ini

@@ -52,7 +52,7 @@ reportTags=TestTag
  
 # iOS Device Capabilities
 #manufacturer-iOS=Apple
-model-iOS=iPhone-12
+model-iOS=iPhone-11
 bundleId-iOS=com.apple.Preferences
 platformName-iOS=iOS
 #default iOS settings app