summaryrefslogtreecommitdiff
path: root/tests
diff options
authorFederico Gimenez <fgimenez@canonical.com>2016-09-12 11:18:31 +0200
committerFederico Gimenez <fgimenez@canonical.com>2016-09-12 11:18:31 +0200
commit0e443b8021f00734d55fb2a74765f9734792c654 (patch)
tree9d078d12f53995ebd2ea6707e4743da7f4d43104 /tests
parent52a23d2cdcf68b451294f60061d997f37d6ee0e9 (diff)
install upower to get required dbus entries; fix expected regexp
Diffstat (limited to 'tests')
-rw-r--r--tests/main/interfaces-upower-observe/task.yaml8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/main/interfaces-upower-observe/task.yaml b/tests/main/interfaces-upower-observe/task.yaml
index c61201cf9d..6e3a763cde 100644
--- a/tests/main/interfaces-upower-observe/task.yaml
+++ b/tests/main/interfaces-upower-observe/task.yaml
@@ -16,8 +16,12 @@ prepare: |
echo "Given a snap declaring a plug on the upower-observe interface is installed"
snap install --edge test-snapd-upower-observe-consumer
+ apt install -y upower
+
restore: |
rm -f upower.error
+ apt remove -y upower
+ apt autoremove -y
execute: |
CONNECTED_PATTERN=":upower-observe +test-snapd-upower-observe-consumer"
@@ -46,5 +50,5 @@ execute: |
snap interfaces | grep -Pzq "$CONNECTED_PATTERN"
echo "Then the snap is able to dump info about the upower devices"
- expected="(?s)Device: /org/freedesktop/UPower/devices/DisplayDevice.*Daemon:.*"
- su -l -c 'test-snapd-upower-observe-consumer.upower --dump' test | grep -Pqz $expected
+ expected="(?s)Device: +/org/freedesktop/UPower/devices/DisplayDevice.*Daemon:.*"
+ su -l -c 'test-snapd-upower-observe-consumer.upower --dump' test | grep -Pqz "$expected"