Skip to content

Commit 90d1a5b

Browse files
GabrielChenCCbinli
authored andcommitted
Adjust the wwan, watchdog and alsa-loopback test cases. (BugFix) (canonical#821)
* The commit is for the alsa-loopback test case delete. Actually, the alsa-loopback-automated test case does the same thing with alsa-loopback. When we test iot project machines, the alsa-loopback-automated needs to be tested. I guess we could do the alsa-loopback-automated only in the futuer. * This commit to modify the watchdog test cases. The watchdog-automated's test items have included watchdog-maunal, so I remove the watchdog-manual test case. * Modify the wwan related test cases. 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 * Revert wwan test-plan.pxu. Keep the necessary dependence of test cases.
1 parent 598fd7a commit 90d1a5b

File tree

8 files changed

+12
-55
lines changed

8 files changed

+12
-55
lines changed

providers/base/units/audio/jobs.pxu

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -755,25 +755,6 @@ estimated_duration: 5
755755
imports: from com.canonical.plainbox import manifest
756756
requires: manifest.has_audio_loopback_connector == 'True'
757757

758-
id: audio/alsa-loopback
759-
_summary: Captured sound matches played one
760-
_purpose:
761-
Check if sound that is 'hearable' by capture device
762-
_steps:
763-
1. Connect line-out to line-in (plug the loop-back cable)
764-
2. Commence the test
765-
3. Observe command's output
766-
_verification:
767-
Is the reported frequency in the 438 - 442 range
768-
plugin: user-interact-verify
769-
depends: audio/detect-playback-devices audio/detect-capture-devices
770-
user: root
771-
environ: ALSA_CONFIG_PATH LD_LIBRARY_PATH ALSADEVICE
772-
flags: also-after-suspend
773-
command: alsa_test loopback -d 5
774-
category_id: com.canonical.plainbox::audio
775-
estimated_duration: 30
776-
777758
id: audio/pa-record-internal-mic
778759
_summary: Record a wav file and check it using pulseaudio - internal mic
779760
_purpose:

providers/base/units/audio/test-plan.pxu

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ _name: Manual audio tests
107107
_description: Manual audio tests for Snappy Ubuntu Core devices
108108
include:
109109
audio/alsa-playback
110-
audio/alsa-loopback
111110

112111
id: audio-pa-manual
113112
unit: test plan
@@ -144,7 +143,6 @@ _name: Manual audio tests (after suspend)
144143
_description: Manual audio tests for Snappy Ubuntu Core devices
145144
include:
146145
after-suspend-audio/alsa-playback
147-
after-suspend-audio/alsa-loopback
148146

149147
id: after-suspend-audio-pa-manual
150148
unit: test plan

providers/base/units/watchdog/jobs.pxu

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,6 @@ flags: simple
1515
imports: from com.canonical.plainbox import manifest
1616
requires: manifest.has_hardware_watchdog == 'True'
1717

18-
id: watchdog/trigger-system-reset
19-
depends: watchdog/systemd-config
20-
_summary: Test that the watchdog module can trigger a system reset
21-
_purpose:
22-
The watchdog module should be capable of issuing a hard reset of the SUT.
23-
_steps:
24-
1. Commence the test to trigger a SysRq.
25-
2. Once the watchdog timeout has expired (10s) the SUT should reset itself.
26-
3. The board will reboot and the user should resume the test session.
27-
_verification:
28-
Did the board reset itself?
29-
command:
30-
echo 1 > /proc/sys/kernel/sysrq
31-
echo 0 > /proc/sys/kernel/panic
32-
echo c > /proc/sysrq-trigger
33-
flags: noreturn preserve-locale
34-
user: root
35-
plugin: user-interact-verify
36-
category_id: com.canonical.plainbox::power-management
37-
estimated_duration: 60
38-
3918
id: watchdog/trigger-system-reset-auto
4019
depends: watchdog/systemd-config
4120
_summary: Test that the watchdog module can trigger a system reset

providers/base/units/watchdog/test-plan.pxu

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ unit: test plan
1212
_name: Manual watchdog tests
1313
_description: Manual watchdog tests for Ubuntu Core devices
1414
include:
15-
watchdog/trigger-system-reset
1615

1716
id: watchdog-automated
1817
unit: test plan

providers/base/units/wwan/test-plan.pxu

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ _name: Manual wwan tests
4646
_description: Manual wwan tests for Snappy Ubuntu Core devices
4747
include:
4848
wwan/detect-manual
49-
wwan/gsm-connection-manual
50-
wwan/check-sim-present-manual
5149
wwan/scan-networks-manual
50+
wwan/check-sim-present-manual
5251
wwan/gsm-connection-interrupted-manual
5352

5453
id: after-suspend-wwan-manual
@@ -57,7 +56,6 @@ _name: Manual wwan tests (after suspend)
5756
_description: Manual wwan tests for Snappy Ubuntu Core devices
5857
include:
5958
after-suspend-wwan/detect-manual
60-
after-suspend-wwan/gsm-connection-manual
61-
after-suspend-wwan/check-sim-present-manual
6259
after-suspend-wwan/scan-networks-manual
63-
after-suspend-wwan/gsm-connection-interrupted-manual
60+
after-suspend-wwan/check-sim-present-manual
61+
after-suspend-wwan/gsm-connection-interrupted-manual

providers/certification-client/units/client-cert-desktop-18-04.pxu

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ nested_part:
3434
misc-client-cert-manual
3535
mediacard-cert-manual
3636
memory-manual
37-
mobilebroadband-cert-manual
37+
wwan-manual
3838
ethernet-cert-manual
3939
networking-cert-manual
4040
optical-cert-manual
@@ -104,7 +104,7 @@ nested_part:
104104
mediacard-cert-automated
105105
mediacard-automated
106106
memory-automated
107-
mobilebroadband-cert-automated
107+
wwan-automated
108108
ethernet-cert-automated
109109
networking-cert-automated
110110
optical-cert-automated
@@ -129,6 +129,7 @@ nested_part:
129129
after-suspend-touchscreen-cert-automated
130130
after-suspend-wireless-cert-automated
131131
after-suspend-bluetooth-cert-automated
132+
after-suspend-wwan-automated
132133
# The following tests should run BEFORE the automated tests. The reboot and
133134
# power off tests will also give us a clean system to start the stress run
134135
# with.

providers/certification-client/units/client-cert-desktop-20-04.pxu

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ nested_part:
3737
led-cert-manual
3838
mediacard-cert-manual
3939
memory-manual
40-
mobilebroadband-cert-manual
40+
wwan-manual
4141
ethernet-cert-manual
4242
networking-cert-manual
4343
optical-cert-manual
@@ -107,7 +107,7 @@ nested_part:
107107
mediacard-cert-automated
108108
mediacard-automated
109109
memory-automated
110-
mobilebroadband-cert-automated
110+
wwan-automated
111111
ethernet-cert-automated
112112
networking-cert-automated
113113
optical-cert-automated
@@ -132,6 +132,7 @@ nested_part:
132132
after-suspend-touchscreen-cert-automated
133133
after-suspend-wireless-cert-automated
134134
after-suspend-bluetooth-cert-automated
135+
after-suspend-wwan-automated
135136
# The following tests should run BEFORE the automated tests. The reboot and
136137
# power off tests will also give us a clean system to start the stress run
137138
# with.

providers/certification-client/units/client-cert-desktop-22-04.pxu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ nested_part:
3737
led-cert-manual
3838
mediacard-cert-manual
3939
memory-manual
40-
mobilebroadband-cert-manual
40+
wwan-manual
4141
ethernet-cert-manual
4242
networking-cert-manual
4343
optical-cert-manual
@@ -111,7 +111,7 @@ nested_part:
111111
mediacard-cert-automated
112112
mediacard-automated
113113
memory-automated
114-
mobilebroadband-cert-automated
114+
wwan-automated
115115
ethernet-cert-automated
116116
networking-cert-automated
117117
optical-cert-automated
@@ -137,7 +137,7 @@ nested_part:
137137
after-suspend-cpu-cert-automated
138138
after-suspend-input-cert-automated
139139
after-suspend-disk-cert-automated
140-
after-suspend-mobilebroadband-cert-automated
140+
after-suspend-wwan-automated
141141
after-suspend-ethernet-cert-automated
142142
after-suspend-networking-cert-automated
143143
after-suspend-optical-cert-automated

0 commit comments

Comments
 (0)