Merge pull request #15 from endlessm/T35403-drop-snap

Drop the requires of snap from the test units

Author: wjt

providers/base/units/audio/jobs.pxu

@@ -787,7 +787,6 @@ _verification:
  Did you hear the recorded sound correctly?
 plugin: manual
 flags: also-after-suspend
-requires: snap.name == 'pulseaudio'
 category_id: com.canonical.plainbox::audio
 estimated_duration: 1m
 
@@ -819,7 +818,6 @@ _verification:
  Did you hear the recorded sound correctly?
 plugin: manual
 flags: also-after-suspend
-requires: snap.name == 'pulseaudio'
 category_id: com.canonical.plainbox::audio
 estimated_duration: 1m
 
@@ -847,7 +845,6 @@ _verification:
  Did you hear the sound correctly?
 plugin: manual
 flags: also-after-suspend
-requires: snap.name == 'pulseaudio'
 category_id: com.canonical.plainbox::audio
 estimated_duration: 1m
 
@@ -875,7 +872,6 @@ _verification:
  Did you hear the sound correctly?
 plugin: manual
 flags: also-after-suspend
-requires: snap.name == 'pulseaudio'
 category_id: com.canonical.plainbox::audio
 estimated_duration: 1m
 
@@ -903,6 +899,5 @@ _verification:
  Did you hear the sound correctly?
 plugin: manual
 flags: also-after-suspend
-requires: snap.name == 'pulseaudio'
 category_id: com.canonical.plainbox::audio
 estimated_duration: 1m

providers/base/units/bluetooth/jobs.pxu

@@ -18,7 +18,7 @@ user: root
 depends: bluetooth/detect
 template-engine: jinja2
 requires:
-  package.name == 'bluez' or snap.name == 'bluez'
+  package.name == 'bluez'
   {%- if __on_ubuntucore__ %}
   connections.slot == 'bluez:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:bluez'
   {% endif -%}
@@ -33,7 +33,7 @@ id: bluetooth/detect-output
 flags: also-after-suspend
 estimated_duration: 1.2
 requires:
- package.name == 'bluez' or snap.name == 'bluez'
+ package.name == 'bluez'
  device.category == 'BLUETOOTH'
 command:
  if rfkill list bluetooth | grep -q 'Hard blocked: yes'; then

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

@@ -13,9 +13,7 @@ bootstrap_include:
  com.canonical.certification::bootloader
  com.canonical.certification::cpuinfo
  com.canonical.certification::device
- com.canonical.certification::interface
  com.canonical.certification::net_if_management
- com.canonical.certification::model_assertion
  com.canonical.certification::dmi_present
  com.canonical.certification::dmi
  com.canonical.certification::removable_partition

providers/base/units/gpio/jobs.pxu

@@ -2,15 +2,13 @@ id: location/status
 _summary: Queries the status of a service instance
 command: locationd.status
 category_id: location
-requires: snap.name == 'locationd'
 estimated_duration: 1
 flags: simple preserve-cwd also-after-suspend
 
 id: location/monitor
 _summary: Connects to a location service instance, monitoring its activity.
 command: timeout 15m bash -c 'grep -m 1 Update <( exec locationd.monitor ); kill $! 2> /dev/null'
 category_id: location
-requires: snap.name == 'locationd'
 estimated_duration: 900
 flags: simple preserve-cwd also-after-suspend
 
@@ -25,7 +23,6 @@ _verification:
   Did the command succeed?
 category_id: location
 flags: also-after-suspend
-requires: snap.name == 'locationd'
 estimated_duration: 1
 plugin: manual
 
@@ -40,7 +37,6 @@ _verification:
   Did the command succeed (it can take up to 15m from a cold start)?
 category_id: location
 flags: also-after-suspend
-requires: snap.name == 'locationd'
 estimated_duration: 900
 plugin: manual
 

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

@@ -148,7 +148,7 @@ flags: preserve-cwd
 command: removable_storage_test.py -s 268400000 --memorycard -l sdio usb scsi && removable_storage_test.py --memorycard sdio usb scsi
 imports: from com.canonical.plainbox import manifest
 requires:
- package.name == 'udisks2' or snap.name == 'udisks2'
+ package.name == 'udisks2'
  manifest.has_card_reader == 'True'
 _summary: Automated test of SD Card reading & writing (udisk2)
 _description:
@@ -596,4 +596,4 @@ requires:
 _summary: Automated test of SD Card reading & writing ({symlink_uuid})
 _description:
  This is a fully automated version of mediacard/sd-automated and assumes that the
- system under test has a memory card device plugged in prior to checkbox execution.
+ system under test has a memory card device plugged in prior to checkbox execution.

providers/base/units/kernel-snap/category.pxu

@@ -12,7 +12,6 @@ depends:
  meminfo
  module
  package
- snap
  requirements
  uname
  device
@@ -147,22 +146,6 @@ _description:
  Test that the system supports rebooting into the firmware setup utility.
 command: boot_mode_test.py reboot_firmware
 
-plugin: shell
-category_id: com.canonical.plainbox::miscellanea
-estimated_duration: 0.5
-unit: template
-template-resource: model_assertion
-template-unit: job
-requires:
- executable.name == 'dumpimage' or executable.name == 'mokutil'
-id: miscellanea/secure_boot_mode_{gadget}
-_summary: Test that {gadget} Ubuntu Core system booted with Secure Boot active
-_description:
- Test to verify that the system booted with Secure Boot active.
-user:root
-command:
- boot_mode_test_snappy.py {gadget} {kernel}
-
 plugin: shell
 category_id: com.canonical.plainbox::miscellanea
 estimated_duration: 0.5
@@ -532,4 +515,4 @@ command:
   if test -f "$PLAINBOX_SESSION_SHARE/ubuntu_drivers_list_oem_check"; then
     cat "$PLAINBOX_SESSION_SHARE/ubuntu_drivers_list_oem_check"
   fi
-  true
+  true

providers/base/units/kernel-snap/jobs.pxu

@@ -511,7 +511,7 @@ user: root
 estimated_duration: 15
 
 unit: template
-template-resource: model_assertion
+template-resource: cpuinfo
 template-unit: job
 plugin: shell
 category_id: com.canonical.plainbox::power-management
@@ -542,4 +542,4 @@ _steps:
     5. Wait until the message "Has ambient light sensor" is printed on the screen and wave your hand slowly during testing.
 _verification:
     Did the Ambient Light Sensor values change when you shaking your hands over the sensor? 
-    Did the Screen backlight also changed?
+    Did the Screen backlight also changed?