Clear up duplicated test plan names that lead to confusion when displayed by checkbox-cli (BugFix)

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

@@ -1,6 +1,6 @@
 id: audio-cert-full
 unit: test plan
-_name: Audio tests
+_name: Audio test (Full)
 _description:
  Audio tests
  See Monitor / Graphic test plans for hybrid-graphic monitor audio tests
@@ -94,7 +94,7 @@ include:
 
 id: audio-full
 unit: test plan
-_name: Audio tests
+_name: Audio tests (QA test for Core devices)
 _description: QA audio tests for Snappy Ubuntu Core devices
 include:
 nested_part:
@@ -130,7 +130,7 @@ include:
 
 id: after-suspend-audio-full
 unit: test plan
-_name: Audio tests (after suspend)
+_name: Audio tests (after suspend, automated and manual)
 _description: QA audio tests for Snappy Ubuntu Core devices
 include:
 nested_part:
@@ -139,7 +139,7 @@ nested_part:
 
 id: after-suspend-audio-manual
 unit: test plan
-_name: Manual audio tests (after suspend)
+_name: Manual audio tests (after suspend, manual)
 _description: Manual audio tests for Snappy Ubuntu Core devices
 include:
     after-suspend-audio/alsa-playback
@@ -157,7 +157,7 @@ include:
 
 id: after-suspend-audio-automated
 unit: test plan
-_name: Automated audio tests
+_name: Automated audio tests (after suspend)
 _description: Automated audio tests for Snappy Ubuntu Core devices
 include:
     after-suspend-audio/detect-playback-devices

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

@@ -1,6 +1,6 @@
 id: bluetooth-cert-full
 unit: test plan
-_name: Bluetooth tests
+_name: Bluetooth tests (Full Cert tests)
 _description:
  Bluetooth tests
 include:
@@ -42,7 +42,7 @@ include:
 
 id: bluetooth-full
 unit: test plan
-_name: Bluetooth tests
+_name: Bluetooth tests (QA tests)
 _description: QA tests for Bluetooth
 estimated_duration: 6m
 include:
@@ -112,15 +112,15 @@ nested_part:
 
 id: after-suspend-bluetooth-manual
 unit: test plan
-_name: Manual Bluetooth tests
+_name: Manual Bluetooth tests (after suspend)
 _description: Manual QA tests for Bluetooth
 estimated_duration: 5m
 include:
     after-suspend-bluetooth/keyboard-manual
 
 id: after-suspend-bluez-automated
 unit: test plan
-_name: Automated tests for bluez
+_name: Automated tests for bluez (after suspend)
 _description:
  Automated tests for bluez
 estimated_duration: 1m

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

@@ -89,7 +89,7 @@ bootstrap_include:
 
 id: camera-full
 unit: test plan
-_name: Camera tests
+_name: Camera tests (Full test plan for Core devices)
 _description: Camera tests for Ubuntu Core devices
 include:
 nested_part:
@@ -113,4 +113,4 @@ include:
     camera/multiple-resolution-images-rpi-attachment_.*
     camera/roundtrip-qrcode_.*
 bootstrap_include:
-    device
+    device

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

@@ -1,6 +1,6 @@
 id: cpu-cert-full
 unit: test plan
-_name: CPU tests
+_name: CPU tests (Cert full)
 _description:
  CPU tests
 include:

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

@@ -128,7 +128,7 @@ include:
 
 id: after-suspend-dock-cert-full
 unit: test plan
-_name: Dock Cert tests after suspend
+_name: Dock Cert tests after suspend (cert full)
 _description:
  Cert tests for dock devices.
 include:

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

@@ -53,7 +53,7 @@ bootstrap_include:
 
 id: ethernet-full
 unit: test plan
-_name: QA tests for ethernet
+_name: QA tests for ethernet (Core devices)
 _description: Ethernet tests for Ubuntu Core devices
 estimated_duration: 1m
 include:

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

@@ -31,7 +31,7 @@ bootstrap_include:
 
 id: after-suspend-input-cert-automated
 unit: test plan
-_name: Input tests (Automated)
+_name: Input tests (Automated after suspend)
 _description:
  Input tests (Automated)
 include:
@@ -64,4 +64,4 @@ _name: Input tests (after suspend, certification blockers only)
 _description: Input tests (after suspend, certification blockers only)
 include:
     suspend/pointing-after-suspend_.*          certification-status=blocker
-    suspend/clicking-after-suspend_.*          certification-status=blocker
+    suspend/clicking-after-suspend_.*          certification-status=blocker

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

@@ -1,6 +1,6 @@
 id: mediacard-cert-full
 unit: test plan
-_name: Mediacard tests
+_name: Mediacard tests (Cert Full)
 _description:
  Mediacard tests
 include:

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

@@ -14,14 +14,14 @@ include:
 
 id: memory-automated
 unit: test plan
-_name: Automated memory tests
+_name: Automated memory tests (Core)
 _description: Automated memory tests for Ubuntu Core devices
 include:
     memory/info    certification-status=blocker
 
 id: server-memory
 unit: test plan
-_name: Automated memory tests
+_name: Automated memory tests (Server)
 _desctiption: Automated memory tests for Server Cert
 include:
     memory/info                 certification-status=blocker

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

@@ -86,7 +86,7 @@ include:
 
 id: server-miscellaneous-regression
 unit: test plan
-_name: Miscellaneous server cert tests
+_name: Miscellaneous server tests for SRU
 _description:
  Miscellaneous server tests (log checks, dmi data, etc)
 mandatory_include:

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

@@ -214,8 +214,8 @@ bootstrap_include:
 
 id: after-suspend-monitor-discrete-gpu-cert-full
 unit: test plan
-_name: Monitor tests (after suspend, integrated GPU)
-_description: Monitor tests (after suspend, integrated GPU)
+_name: Monitor tests (after suspend, discrete GPU)
+_description: Monitor tests (after suspend, discrete GPU)
 include:
 nested_part:
     after-suspend-monitor-discrete-gpu-cert-manual
@@ -348,7 +348,7 @@ bootstrap_include:
 
 id: monitor-full
 unit: test plan
-_name: Monitor tests
+_name: Monitor tests (QA manual)
 _description: QA monitor tests for Snappy Ubuntu Core devices
 include:
 nested_part:

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

@@ -65,8 +65,8 @@ bootstrap_include:
 
 id: after-suspend-optical-cert-blockers
 unit: test plan
-_name: Optical drive tests (certification blockers only)
-_description: Optical drive tests (certification blockers only)
+_name: Optical drive tests (certification blockers only after suspend)
+_description: Optical drive tests (certification blockers only after suspend)
 include:
     optical/detect                                                      certification-status=blocker
     after-suspend-optical/read_.*                                       certification-status=blocker

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

@@ -12,7 +12,7 @@ nested_part:
 
 id: snappy-snap-full-with-refresh-control
 unit: test plan
-_name: Tests for snap command
+_name: Tests for snap command (with refresh control)
 _description:
  QA test plan that includes generic tests for the snap command for Snappy
  Ubuntu Core devices.

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

@@ -1,6 +1,6 @@
 id: stress-cert-full
 unit: test plan
-_name: Stress tests
+_name: Stress tests (Cert Full)
 _description:
  Stress tests
 include:

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

@@ -10,9 +10,9 @@ nested_part:
 
 id: after-suspend-thunderbolt-cert-full
 unit: test plan
-_name: Thunderbolt tests
+_name: Thunderbolt tests (after suspend)
 _description:
- Thunderbolt tests
+ Thunderbolt tests after suspend
 include:
 nested_part:
  com.canonical.certification::after-suspend-thunderbolt-cert-manual

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

@@ -42,7 +42,7 @@ include:
 
 id: after-suspend-touchpad-cert-full
 unit: test plan
-_name: Touchpad tests
+_name: Touchpad tests (after suspend)
 _description: Touchpad tests
 include:
     after-suspend-touchpad/basic                                 certification-status=blocker
@@ -77,4 +77,4 @@ include:
     touchpad/singletouch-selection-after-suspend   certification-status=blocker
     touchpad/drag-and-drop-after-suspend           certification-status=blocker
     touchpad/multitouch-rightclick-after-suspend   certification-status=blocker
-    touchpad/multitouch-after-suspend              certification-status=blocker
+    touchpad/multitouch-after-suspend              certification-status=blocker

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

@@ -33,19 +33,19 @@ include:
 
 id: after-suspend-touchscreen-cert-full
 unit: test plan
-_name: Touchscreen tests
+_name: Touchscreen tests (after suspend)
 _description:
- Touchscreen tests
+ Touchscreen tests after suspend
 include:
 nested_part:
  after-suspend-touchscreen-cert-manual
  after-suspend-touchscreen-cert-automated
 
 id: after-suspend-touchscreen-cert-manual
 unit: test plan
-_name: Touchscreen tests (Manual)
+_name: Touchscreen tests (Manual after suspend)
 _description:
- Touchscreen tests (Manual)
+ Touchscreen tests (Manual after suspend)
 include:
  after-suspend-touchscreen/drag-n-drop                certification-status=blocker
  after-suspend-touchscreen/multitouch-zoom            certification-status=blocker
@@ -59,9 +59,9 @@ bootstrap_include:
 
 id: after-suspend-touchscreen-cert-automated
 unit: test plan
-_name: Touchscreen tests (Automated)
+_name: Touchscreen tests (Automated after suspend)
 _description:
- Touchscreen tests (Automated)
+ Touchscreen tests (Automated after suspend)
 include:
 
 id: touchscreen-cert-blockers
@@ -106,4 +106,4 @@ _description:
 include:
  after-suspend-touchscreen/evdev.*
 bootstrap_include:
- device
+ device

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

@@ -1,6 +1,6 @@
 id: usb-cert-full
 unit: test plan
-_name: USB tests
+_name: USB tests (Cert full)
 _description:
  USB tests
 include:
@@ -27,15 +27,15 @@ include:
 
 id: after-suspend-usb-cert-automated
 unit: test plan
-_name: USB tests (Automated)
+_name: USB tests (Automated after suspend)
 _description:
  USB tests (Automated)
 include:
  after-suspend-usb/detect                                 certification-status=blocker
 
 id: usb3-cert-full
 unit: test plan
-_name: USB3 tests
+_name: USB3 tests (Cert full)
 _description:
  USB3 tests
 include:
@@ -70,15 +70,15 @@ include:
 
 id: after-suspend-usb-cert-full
 unit: test plan
-_name: USB tests (after suspend)
+_name: USB tests (cert full after suspend)
 _description: USB tests (after suspend)
 include:
  after-suspend-usb/hid                                    certification-status=blocker
  after-suspend-usb/storage-manual                         certification-status=blocker
 
 id: after-suspend-usb3-cert-full
 unit: test plan
-_name: USB3 tests (after suspend)
+_name: USB3 tests (cert full after suspend)
 _description: USB3 tests (after suspend)
 include:
  after-suspend-usb3/storage-manual                        certification-status=blocker

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

@@ -1,6 +1,6 @@
 id: wireless-cert-full
 unit: test plan
-_name: Wireless tests
+_name: Wireless tests (cert full)
 _description:
  Wireless connection tests
 include:
@@ -17,15 +17,15 @@ include:
 
 id: after-suspend-wireless-cert-full
 unit: test plan
-_name: Wireless tests (after suspend)
+_name: Wireless tests (cert full after suspend)
 _description: Wireless connection tests (after suspend)
 include:
 nested_part:
     after-suspend-wireless-cert-automated
 
 id: wireless-cert-automated
 unit: test plan
-_name: Wireless tests
+_name: Wireless tests (cert automated)
 _description: Wireless connection tests
 bootstrap_include:
     device
@@ -257,7 +257,7 @@ bootstrap_include:
 
 id: wireless-wifi-master-mode-manual
 unit: test plan
-_name: QA tests for wifi master mode
+_name: QA tests for wifi master mode (manual)
 _description:
  System as Access Point tests
 include:
@@ -304,7 +304,7 @@ bootstrap_include:
 
 id: after-suspend-wireless-wifi-master-mode-manual
 unit: test plan
-_name: QA tests for wifi master mode (after suspend)
+_name: QA tests for wifi master mode (after suspend, manual mode)
 _description:
  System as Access Point tests
 include:
@@ -320,7 +320,7 @@ bootstrap_include:
 
 id: after-suspend-wireless-wifi-master-mode-auto
 unit: test plan
-_name: QA tests for wifi master mode (after suspend)
+_name: QA tests for wifi master mode (after suspend, auto mode)
 _description:
  System as Access Point tests
 include: