substitute regex in after-suspend test plans

canonical · Mar 29, 2024 · ce670a8 · ce670a8
1 parent 7dd7e1b
commit ce670a8
Show file tree

Hide file tree

Showing 18 changed files with 134 additions and 134 deletions.
diff --git a/providers/base/units/bluetooth/test-plan.pxu b/providers/base/units/bluetooth/test-plan.pxu
@@ -124,17 +124,17 @@ _description:
  Automated tests for bluez
 estimated_duration: 1m
 include:
-    after-suspend-bluetooth/bluez-internal-rfcomm-tests_.*
-    after-suspend-bluetooth/bluez-internal-hci-tests_.*
+    bluetooth/bluez-internal-rfcomm-tests_bluez-internal-rfcomm-test
+    bluetooth/bluez-internal-hci-tests_bluez-internal-hci-test
     # Blacklist all mngt tests since they randomly fail
     # (even with upstream 5.45)
     # Note: The mgmt tests are not that much critical as these just test
     # the management interface.
     # Next line is commented out until upstream fixes the issue
-    # after-suspend-bluetooth/bluez-internal-mgmt-tests_.*
-    after-suspend-bluetooth/bluez-internal-uc-tests_.*
-    after-suspend-bluetooth/bluez-internal-bnep-tests_.*
-    after-suspend-bluetooth4/beacon_eddystone_url_.*
+    # after-suspend-bluetooth/bluez-internal-mgmt-tests_bluez-internal-mgmt-test
+    bluetooth/bluez-internal-uc-tests_bluez-internal-uc-test
+    bluetooth/bluez-internal-bnep-tests_bluez-internal-bnep-test
+    bluetooth4/beacon_eddystone_url_interface
 bootstrap_include:
     device
     bluez-internal-rfcomm-tests
@@ -184,6 +184,6 @@ _description: Automated Bluetooth tests (after suspend)
 include:
     after-suspend-bluetooth/detect-output                  certification-status=blocker
     after-suspend-bluetooth/bluetooth_obex_send            certification-status=blocker
-    after-suspend-bluetooth4/beacon_eddystone_url_.*       certification-status=blocker
+    bluetooth4/beacon_eddystone_url_interface       certification-status=blocker
 bootstrap_include:
     device
diff --git a/providers/base/units/camera/test-plan.pxu b/providers/base/units/camera/test-plan.pxu
@@ -24,8 +24,8 @@ unit: test plan
 _name: Camera tests (after suspend)
 _description: Camera tests (after suspend)
 include:
- after-suspend-camera/still_.*                     certification-status=blocker
- after-suspend-camera/display_.*                   certification-status=blocker
+ camera/still_name                     certification-status=blocker
+ camera/display_name                   certification-status=blocker
 bootstrap_include:
  device
 
@@ -57,8 +57,8 @@ unit: test plan
 _name: Camera tests (after suspend, certification blockers only)
 _description: Camera tests (after suspend, certification blockers only)
 include:
- after-suspend-camera/still_.*                     certification-status=blocker
- after-suspend-camera/display_.*                   certification-status=blocker
+ camera/still_name                     certification-status=blocker
+ camera/display_name                   certification-status=blocker
 bootstrap_include:
  device
 
@@ -68,8 +68,8 @@ _name: Camera tests After Suspend (automated)
 _description: Camera tests After Suspend (automated)
 include:
  after-suspend-camera/detect                                     certification-status=blocker
- after-suspend-camera/multiple-resolution-images_.*              certification-status=blocker
- after-suspend-camera/camera-quality_*                           certification-status=non-blocker
+ camera/multiple-resolution-images_name              certification-status=blocker
+ camera/camera-quality_name                           certification-status=non-blocker
 bootstrap_include:
  device
 

diff --git a/providers/base/units/disk/test-plan.pxu b/providers/base/units/disk/test-plan.pxu
@@ -25,12 +25,12 @@ _name: Disk tests after suspend (automated)
 _description: Disk tests after suspend (automated)
 include:
     after-suspend-disk/detect                                certification-status=blocker
-    after-suspend-disk/stats_.*
-    after-suspend-disk/read_performance_.*                   certification-status=blocker
-    after-suspend-disk/storage_device_.*                     certification-status=blocker
-    after-suspend-benchmarks/disk/hdparm-read_.*
-    after-suspend-benchmarks/disk/hdparm-cache-read_.*
-    after-suspend-disk/apste_support_on_.*
+    disk/stats_name
+    disk/read_performance_name                   certification-status=blocker
+    disk/storage_device_name                     certification-status=blocker
+    benchmarks/disk/hdparm-read_name
+    benchmarks/disk/hdparm-cache-read_name
+    disk/apste_support_on_name
 
 id: disk-cert-blockers
 unit: test plan

diff --git a/providers/base/units/ethernet/test-plan.pxu b/providers/base/units/ethernet/test-plan.pxu
@@ -90,7 +90,7 @@ _description: Manual ethernet tests for Ubuntu Core devices
 estimated_duration: 1m
 include:
     after-suspend-ethernet/detect                  certification-status=blocker
-    after-suspend-ethernet/hotplug-.*              certification-status=blocker
+    ethernet/hotplug-interface              certification-status=blocker
 bootstrap_include:
     device
 
@@ -101,7 +101,7 @@ _description: Automated ethernet tests for Ubuntu Core devices
 estimated_duration: 1m
 include:
     after-suspend-ethernet/detect
-    after-suspend-ethernet/ping_.*
+    ethernet/ping_interface
 bootstrap_include:
     device
 

diff --git a/providers/base/units/gpio/test-plan.pxu b/providers/base/units/gpio/test-plan.pxu
@@ -37,5 +37,5 @@ _description: Automated GPIO tests for Ubuntu Core devices (after suspend)
 bootstrap_include:
     model_assertion
 include:
-    after-suspend-gpio/sysfs_loopback_pairs_.*
-    after-suspend-gpio/gpiomem_loopback_pairs_.*
+    gpio/sysfs_loopback_pairs_model
+    gpio/gpiomem_loopback_pairs_model
diff --git a/providers/base/units/input/test-plan.pxu b/providers/base/units/input/test-plan.pxu
@@ -35,7 +35,7 @@ _name: Input tests (Automated)
 _description:
  Input tests (Automated)
 include:
- after-suspend-input/fixed_screen_orientation_on_.*       certification-status=non-blocker
+ input/fixed_screen_orientation_on_product___index__       certification-status=non-blocker
 bootstrap_include:
  dmi
 
@@ -45,8 +45,8 @@ _name: Input tests (after suspend)
 _description: Input tests (after suspend)
 include:
     after-suspend-input/accelerometer                        certification-status=blocker
-    after-suspend-input/pointing_.*                          certification-status=blocker
-    after-suspend-input/clicking_.*                          certification-status=blocker
+    input/pointing_product_slug_category___index__                          certification-status=blocker
+    input/clicking_product_slug_category___index__                          certification-status=blocker
     after-suspend-input/keyboard                             certification-status=blocker
 
 id: input-cert-blockers

diff --git a/providers/base/units/led/test-plan.pxu b/providers/base/units/led/test-plan.pxu
@@ -51,7 +51,7 @@ unit: test plan
 _name: LED tests (after suspend)
 _description: LED tests (after suspend)
 include:
-    after-suspend-camera/led_.*                 certification-status=blocker
+    camera/led_name                 certification-status=blocker
     after-suspend-led/caps-lock                 certification-status=blocker
     after-suspend-led/numeric-keypad            certification-status=blocker
     after-suspend-led/power                     certification-status=blocker
@@ -82,7 +82,7 @@ unit: test plan
 _name: LED tests (after suspend, certification blockers only)
 _description: LED tests (after suspend, certification blockers only)
 include:
-    after-suspend-camera/led_.*                 certification-status=blocker
+    camera/led_name                 certification-status=blocker
     suspend/led_after_suspend/caps-lock         certification-status=blocker
     suspend/led_after_suspend/numeric-keypad    certification-status=blocker
     suspend/led_after_suspend/power             certification-status=blocker
@@ -138,9 +138,9 @@ _description:
     Manual LED indicator tests for IoT devices (after_suspend)
     Notes: the led-indicator/gpio-leds will be deprecated in next release
 include:
-    after-suspend-led-indicator/gpio-leds-.*
-    after-suspend-led-indicator/gpio-controller-leds-.*
-    after-suspend-led-indicator/sysfs-leds-.*
+    led-indicator/gpio-leds-name
+    led-indicator/gpio-controller-leds-name
+    led-indicator/sysfs-leds-name
 bootstrap_include:
     led-indicator/gpio-leds
     led-indicator/gpio-controller-leds

diff --git a/providers/base/units/networking/test-plan.pxu b/providers/base/units/networking/test-plan.pxu
@@ -86,7 +86,7 @@ unit: test plan
 _name: Manual networking tests for devices (after suspend)
 _description: Manual networking tests for devices (after suspend)
 include:
-    after-suspend-networking/info_device.*                       certification-status=blocker
+    networking/info_device__index___interface                       certification-status=blocker
 bootstrap_include:
     device
     executable
@@ -97,7 +97,7 @@ _name: Automated networking tests for devices (after suspend)
 _description: Automated networking tests for devices (after suspend)
 include:
   after-suspend-ipv6_detect
-  after-suspend-ipv6_link_local_address_.*
+  ipv6_link_local_address_interface
 bootstrap_include:
   device
 

diff --git a/providers/base/units/optical/test-plan.pxu b/providers/base/units/optical/test-plan.pxu
@@ -49,8 +49,8 @@ _description:
  Optical drive tests (after suspend)
 include:
     optical/detect                                                      certification-status=blocker
-    after-suspend-optical/read_.*                                       certification-status=blocker
-    after-suspend-optical/bluray-read_.*                                certification-status=blocker
+    optical/read_name                                       certification-status=blocker
+    optical/bluray-read_name                                certification-status=blocker
 bootstrap_include:
     device
 
@@ -71,7 +71,7 @@ _name: Optical drive tests (certification blockers only)
 _description: Optical drive tests (certification blockers only)
 include:
     optical/detect                                                      certification-status=blocker
-    after-suspend-optical/read_.*                                       certification-status=blocker
-    after-suspend-optical/bluray-read_.*                                certification-status=blocker
+    optical/read_name                                       certification-status=blocker
+    optical/bluray-read_name                                certification-status=blocker
 bootstrap_include:
     device
diff --git a/providers/base/units/rtc/test-plan.pxu b/providers/base/units/rtc/test-plan.pxu
@@ -48,5 +48,5 @@ bootstrap_include:
     rtc_list
 include:
     after-suspend-rtc/rtc_number
-    after-suspend-rtc/rtc_alarm_.*
-    after-suspend-rtc/rtc_clock_.*
+    rtc/rtc_alarm_rtc
+    rtc/rtc_clock_rtc
diff --git a/providers/base/units/serial/test-plan.pxu b/providers/base/units/serial/test-plan.pxu
@@ -44,4 +44,4 @@ unit: test plan
 _name: Automated serial tests (after suspend)
 _description: Automated serial tests for Snappy Ubuntu Core devices
 include:
-    after-suspend-serial/loopback-.*
+    serial/loopback-dev
diff --git a/providers/base/units/socketcan/test-plan.pxu b/providers/base/units/socketcan/test-plan.pxu
@@ -22,7 +22,7 @@ _name: SocketCAN Tests (Automated, Remote, After Suspend)
 _description:
   SocketCAN Tests (Automated, Remote, After Suspend)
 include:
-  after-suspend-socketcan/send_packet_remote_.*
+  socketcan/send_packet_remote_sff_interface
 
 
 id: after-suspend-socketcan-manual-remote
@@ -56,7 +56,7 @@ _name: SocketCAN Tests (Automated, Local, After Suspend)
 _description:
   SocketCAN Tests (Automated, Local, After Suspend)
 include:
-  after-suspend-socketcan/send_packet_local_.*
+  socketcan/send_packet_local_sff_interface
 
 
 id: after-suspend-socketcan-manual-local

diff --git a/providers/base/units/touchpad/test-plan.pxu b/providers/base/units/touchpad/test-plan.pxu
@@ -38,7 +38,7 @@ _description:
  Touchpad tests after suspend (Automated)
 include:
  after-suspend-touchpad/detected-as-mouse                     certification-status=blocker
- after-suspend-touchpad/palm-rejection-firmware-labeling_.*   certification-status=non-blocker
+ touchpad/palm-rejection-firmware-labeling_product_slug   certification-status=non-blocker
 
 id: after-suspend-touchpad-cert-full
 unit: test plan

diff --git a/providers/base/units/touchscreen/test-plan.pxu b/providers/base/units/touchscreen/test-plan.pxu
@@ -50,10 +50,10 @@ include:
  after-suspend-touchscreen/drag-n-drop                certification-status=blocker
  after-suspend-touchscreen/multitouch-zoom            certification-status=blocker
  after-suspend-touchscreen/multitouch-rotate
- after-suspend-touchscreen/evdev/single-touch-tap-.*  certification-status=blocker
- after-suspend-touchscreen/evdev/2-touch-tap-.*       certification-status=blocker
- after-suspend-touchscreen/evdev/3-touch-tap-.*       certification-status=blocker
- after-suspend-touchscreen/evdev/4-touch-tap-.*       certification-status=blocker
+ touchscreen/evdev/single-touch-tap-product_slug  certification-status=blocker
+ touchscreen/evdev/2-touch-tap-product_slug       certification-status=blocker
+ touchscreen/evdev/3-touch-tap-product_slug       certification-status=blocker
+ touchscreen/evdev/4-touch-tap-product_slug       certification-status=blocker
 bootstrap_include:
  device
 
@@ -83,8 +83,8 @@ _description: Touchscreen tests (after suspend, certification blockers only)
 include:
   after-suspend-touchscreen/drag-n-drop             certification-status=blocker
   after-suspend-touchscreen/multitouch-zoom         certification-status=blocker
-  after-suspend-touchscreen/evdev/3-touch-tap-.*    certification-status=blocker
-  after-suspend-touchscreen/evdev/4-touch-tap-.*    certification-status=blocker
+  touchscreen/evdev/3-touch-tap-product_slug    certification-status=blocker
+  touchscreen/evdev/4-touch-tap-product_slug    certification-status=blocker
 bootstrap_include:
  device
 
@@ -104,6 +104,6 @@ _name: Touchscreen evdev tests (after suspend)
 _description:
  Touchscreen evdev tests
 include:
- after-suspend-touchscreen/evdev.*
+ touchscreen/evdev/single-touch-tap-product_slug
 bootstrap_include:
  device
diff --git a/providers/base/units/usb/test-plan.pxu b/providers/base/units/usb/test-plan.pxu
@@ -374,7 +374,7 @@ _name: Automated USB tests
 _description: Automated USB tests for Ubuntu Core devices
 include:
     after-suspend-usb/storage-detect
-    after-suspend-usb/storage-preinserted-.*
+    usb/storage-preinserted-symlink_uuid
 bootstrap_include:
     removable_partition