1
diff --git a/snapcraft.yaml b/snapcraft.yaml
2
index 68d01f7..fca7888 100644
3
--- a/snapcraft.yaml
4
+++ b/snapcraft.yaml
5
@@ -14,7 +14,7 @@ grade: stable
6
14
apps:
14
apps:
7
15
  bluetoothctl:
15
  bluetoothctl:
8
16
    command: usr/bin/bluetoothctl
16
    command: usr/bin/bluetoothctl
10
17
    plugs: [client]
17
    plugs: [client, uhid]
11
18
    aliases:
18
    aliases:
12
19
      - bluetoothctl
19
      - bluetoothctl
13
20
  obexctl:
20
  obexctl:
14
@@ -26,6 +26,7 @@ apps:
15
26
    command: "usr/lib/bluetooth/bluetoothd -E"
26
    command: "usr/lib/bluetooth/bluetoothd -E"
16
27
    daemon: simple
27
    daemon: simple
17
28
    slots: [service]
28
    slots: [service]
18
29
    plugs: [uhid]
19
29
  obex:
30
  obex:
20
30
    command: "usr/lib/bluetooth/obexd"
31
    command: "usr/lib/bluetooth/obexd"
21
31
    daemon: simple
32
    daemon: simple
22
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
23
index ff2cef8..d2cc716 100644
24
--- a/tests/lib/utilities.sh
25
+++ b/tests/lib/utilities.sh
26
@@ -22,10 +22,11 @@ install_snap_under_test() {
27
22
			snap install --$SNAP_CHANNEL $SNAP_NAME
22
			snap install --$SNAP_CHANNEL $SNAP_NAME
28
23
		fi
23
		fi
29
24
	else
24
	else
32
25
        # Install first from store to avoid error when performing the connection
25
		# Install first from store to avoid error when performing the connection
33
26
        snap install $SNAP_NAME
26
		snap install $SNAP_NAME
34
27
		# Install prebuilt snap
27
		# Install prebuilt snap
35
28
		snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap
28
		snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap
36
29
		snap connect bluez:uhid :uhid
37
29
		if [ -n "$SNAP_AUTO_ALIASES" ]; then
30
		if [ -n "$SNAP_AUTO_ALIASES" ]; then
38
30
			for alias in $SNAP_AUTO_ALIASES ; do
31
			for alias in $SNAP_AUTO_ALIASES ; do
39
31
				snap alias $SNAP_NAME $alias
32
				snap alias $SNAP_NAME $alias
40
diff --git a/tests/main/installation/task.yaml b/tests/main/installation/task.yaml
41
index 0fb2fb6..8b0fb36 100644
42
--- a/tests/main/installation/task.yaml
43
+++ b/tests/main/installation/task.yaml
44
@@ -6,3 +6,4 @@ execute: |
45
6
6
46
7
    # Ensure all necessary plugs/slots are connected
7
    # Ensure all necessary plugs/slots are connected
47
8
    snap interfaces | grep -Pzq "bluez:service +bluez:client"
8
    snap interfaces | grep -Pzq "bluez:service +bluez:client"
48
9
    snap interfaces | grep -Pzq ":uhid +bluez"
Status:	Merged
Approved by:	Simon Fels on 2017-02-14
Approved revision:	d1aea280899be3961db74b1f4eebf91856619240
Merged at revision:	cf306c3dd10466d5434e8fe47f7de17d92bbc1d0
Proposed branch:	~kzapalowicz/snappy-hwe-snaps/+git/bluez:feature/use-uhid
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:master
Diff against target:	48 lines (+6/-3) 3 files modified snapcraft.yaml (+2/-1) tests/lib/utilities.sh (+3/-2) tests/main/installation/task.yaml (+1/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
System Enablement Bot	continuous-integration	2017-01-19	Approve on 2017-03-16
Simon Fels			Approve on 2017-02-09
Jim Hodapp (community)			Approve on 2017-02-09
Review via email: mp+315108@code.launchpad.net