Modify the wwan related test cases.

GabrielChenCC · GabrielChenCC · commit 63d0a9326c24 · 2023-11-15T14:44:30.000+08:00
The mobilebroadband-cert-automated test case is only
part of the wwan test plan. We hope to replace
mobilebroadband-cert-automated with wwan-automated.

The relevant test plans we currently use include:
client-cert-desktop-22-04-automated
client-cert-desktop-20-04-automated
client-cert-desktop-18-04-automated

I have replaced mobilebroadband-cert-automated in them
with wwan-automated, and added after-sudpend-wwan-
automated to ensure that wwan is tested before and after
suspend.

In addition, for mobilebroadband-cert-manual in the Manual
test plan, when the SIM is inserted into the prototype in the
desktop, the system should automatically recognize wwan and
SIM card, and we do not need to perform manual testing. So I
deleted mobilebroadband-cert-manual in the relevant test
plans. At the same time, since wwan-automated already
contains wwan-manual cases, I deleted the wwan-manual in
these test plans:
client-cert-desktop-22-04-manual
client-cert-desktop-20-04-manual
client-cert-desktop-18-04-manual
diff --git a/providers/base/units/watchdog/test-plan.pxu b/providers/base/units/watchdog/test-plan.pxu
@@ -7,6 +7,12 @@ nested_part:
     watchdog-manual
     watchdog-automated
 
+id: watchdog-manual
+unit: test plan
+_name: Manual watchdog tests
+_description: Manual watchdog tests for Ubuntu Core devices
+include:
+
 id: watchdog-automated
 unit: test plan
 _name: Automated watchdog tests
diff --git a/providers/base/units/wwan/test-plan.pxu b/providers/base/units/wwan/test-plan.pxu
@@ -46,8 +46,6 @@ _name: Manual wwan tests
 _description: Manual wwan tests for Snappy Ubuntu Core devices
 include:
     wwan/detect-manual
-    wwan/gsm-connection-manual
-    wwan/check-sim-present-manual
     wwan/scan-networks-manual
     wwan/gsm-connection-interrupted-manual
 
@@ -57,7 +55,5 @@ _name: Manual wwan tests (after suspend)
 _description: Manual wwan tests for Snappy Ubuntu Core devices
 include:
     after-suspend-wwan/detect-manual
-    after-suspend-wwan/gsm-connection-manual
-    after-suspend-wwan/check-sim-present-manual
     after-suspend-wwan/scan-networks-manual
-    after-suspend-wwan/gsm-connection-interrupted-manual
+    after-suspend-wwan/gsm-connection-interrupted-manual
diff --git a/providers/certification-client/units/client-cert-desktop-18-04.pxu b/providers/certification-client/units/client-cert-desktop-18-04.pxu
@@ -34,7 +34,7 @@ nested_part:
     misc-client-cert-manual
     mediacard-cert-manual
     memory-manual
-    mobilebroadband-cert-manual
+    wwan-manual
     ethernet-cert-manual
     networking-cert-manual
     optical-cert-manual
@@ -104,7 +104,7 @@ nested_part:
     mediacard-cert-automated
     mediacard-automated
     memory-automated
-    mobilebroadband-cert-automated
+    wwan-automated
     ethernet-cert-automated
     networking-cert-automated
     optical-cert-automated
@@ -129,6 +129,7 @@ nested_part:
     after-suspend-touchscreen-cert-automated
     after-suspend-wireless-cert-automated
     after-suspend-bluetooth-cert-automated
+    after-suspend-wwan-automated
     # The following tests should run BEFORE the automated tests. The reboot and
     # power off tests will also give us a clean system to start the stress run
     # with.
diff --git a/providers/certification-client/units/client-cert-desktop-20-04.pxu b/providers/certification-client/units/client-cert-desktop-20-04.pxu
@@ -37,7 +37,7 @@ nested_part:
     led-cert-manual
     mediacard-cert-manual
     memory-manual
-    mobilebroadband-cert-manual
+    wwan-manual
     ethernet-cert-manual
     networking-cert-manual
     optical-cert-manual
@@ -107,7 +107,7 @@ nested_part:
     mediacard-cert-automated
     mediacard-automated
     memory-automated
-    mobilebroadband-cert-automated
+    wwan-automated
     ethernet-cert-automated
     networking-cert-automated
     optical-cert-automated
@@ -132,6 +132,7 @@ nested_part:
     after-suspend-touchscreen-cert-automated
     after-suspend-wireless-cert-automated
     after-suspend-bluetooth-cert-automated
+    after-suspend-wwan-automated
     # The following tests should run BEFORE the automated tests. The reboot and
     # power off tests will also give us a clean system to start the stress run
     # with.
diff --git a/providers/certification-client/units/client-cert-desktop-22-04.pxu b/providers/certification-client/units/client-cert-desktop-22-04.pxu
@@ -37,7 +37,7 @@ nested_part:
     led-cert-manual
     mediacard-cert-manual
     memory-manual
-    mobilebroadband-cert-manual
+    wwan-manual
     ethernet-cert-manual
     networking-cert-manual
     optical-cert-manual
@@ -112,7 +112,7 @@ nested_part:
     mediacard-cert-automated
     mediacard-automated
     memory-automated
-    mobilebroadband-cert-automated
+    wwan-automated
     ethernet-cert-automated
     networking-cert-automated
     optical-cert-automated
@@ -137,7 +137,7 @@ nested_part:
     after-suspend-cpu-cert-automated
     after-suspend-input-cert-automated
     after-suspend-disk-cert-automated
-    after-suspend-mobilebroadband-cert-automated
+    after-suspend-wwan-automated
     after-suspend-ethernet-cert-automated
     after-suspend-networking-cert-automated
     after-suspend-optical-cert-automated
