tests: Disable UART in PPK tests

Disable UART in PPK tests
Fix some compliance issues in the ppk test

Signed-off-by: Simen S. Røstad <simen.rostad@nordicsemi.no>

Author: simensrostad

tests/on_target/tests/test_functional/test_fota.py

@@ -215,10 +215,15 @@ def test_full_mfw_fota(run_fota_fixture):
     '''
     Test full modem FOTA on nrf9151
     '''
-    run_fota_fixture(
-        bundle_id=FULL_MFW_BUNDLEID,
-        fota_type="full",
-        new_version=MFW_202_VERSION,
-        fotatimeout=FULL_MFW_FOTA_TIMEOUT,
-        reschedule=True
-    )
+
+    try:
+        run_fota_fixture(
+            bundle_id=FULL_MFW_BUNDLEID,
+            fota_type="full",
+            new_version=MFW_202_VERSION,
+            fotatimeout=FULL_MFW_FOTA_TIMEOUT,
+            reschedule=True
+        )
+    finally:
+        # Restore mfw202, no matter if test pass/fails
+        flash_device(os.path.abspath(MFW_202_FILEPATH))

tests/on_target/tests/test_ppk/test_power.py

@@ -135,7 +135,7 @@ def thingy91x_ppk2():
     ppk2_dev.toggle_DUT_power("ON")  # enable DUT power
 
     time.sleep(10)
-    for i in range(10):
+    for _ in range(10):
         try:
             all_uarts = get_uarts()
             logger.warning(f"momo all uarts {all_uarts}")
@@ -175,6 +175,10 @@ def test_power(thingy91x_ppk2, hex_file):
     except AssertionError:
         pytest.skip("Device unable to connect to cloud, skip ppk test")
 
+    # Disable UART on the device
+    thingy91x_ppk2.t91x_uart.write("pm suspend uartuart@9000\r\n")
+    thingy91x_ppk2.t91x_uart.write("pm suspend uartuart@8000\r\n")
+
     thingy91x_ppk2.ppk2_dev.start_measuring()
 
     start = time.time()
@@ -214,7 +218,7 @@ def test_power(thingy91x_ppk2, hex_file):
                     last_log_time = current_time
 
                     # Check if PSM target has been reached
-                    if rolling_average < MAX_CURRENT_PSM_UA and rolling_average > 0:
+                    if 0 < rolling_average < MAX_CURRENT_PSM_UA:
                         psm_reached = True
 
         except Exception as e: