9
9
import types
10
10
from utils .flash_tools import recover_device
11
11
from utils .uart import Uart , UartBinary
12
- from utils .hellonrfcloud_fota import HelloNrfCloudFOTA
13
12
import sys
14
13
sys .path .append (os .getcwd ())
15
14
from utils .logger import get_logger
20
19
21
20
SEGGER = os .getenv ('SEGGER' )
22
21
UART_ID = os .getenv ('UART_ID' , SEGGER )
23
- FOTADEVICE_IMEI = os .getenv ('IMEI' )
24
22
FOTADEVICE_FINGERPRINT = os .getenv ('FINGERPRINT' )
25
23
26
24
def get_uarts ():
@@ -60,24 +58,8 @@ def t91x_board():
60
58
pytest .fail ("No UARTs found" )
61
59
log_uart_string = all_uarts [0 ]
62
60
uart = Uart (log_uart_string , timeout = UART_TIMEOUT )
63
- fota = HelloNrfCloudFOTA (device_id = f"oob-{ FOTADEVICE_IMEI } " , \
64
- fingerprint = FOTADEVICE_FINGERPRINT )
65
61
66
- yield types .SimpleNamespace (
67
- uart = uart ,
68
- fota = fota
69
- )
70
-
71
- # Cancel pending fota jobs, at fota test teardown
72
- if FOTADEVICE_IMEI :
73
- try :
74
- pending_jobs = fota .check_pending_jobs ()
75
- if pending_jobs :
76
- logger .warning (f"{ len (pending_jobs )} pending fota jobs found for fota device" )
77
- logger .info ("Canceling pending jobs" )
78
- fota .delete_jobs (pending_jobs )
79
- except Exception as e :
80
- logger .error (f"Error during teardown while canceling pending fota jobs: { e } " )
62
+ yield types .SimpleNamespace (uart = uart )
81
63
82
64
uart_log = uart .whole_log
83
65
uart .stop ()
@@ -102,7 +84,7 @@ def t91x_traces(t91x_board):
102
84
def hex_file ():
103
85
# Search for the firmware hex file in the artifacts folder
104
86
artifacts_dir = "artifacts"
105
- hex_pattern = r"hello\.nrfcloud\.com -[0-9a-z\.]+-thingy91x-nrf91\.hex"
87
+ hex_pattern = r"asset-tracker-template -[0-9a-z\.]+-thingy91x-nrf91\.hex"
106
88
107
89
for file in os .listdir (artifacts_dir ):
108
90
if re .match (hex_pattern , file ):
0 commit comments