summaryrefslogtreecommitdiff
diff options
authorMichael Vogt <mvo@ubuntu.com>2018-02-23 08:59:16 +0100
committerMichael Vogt <mvo@ubuntu.com>2018-02-23 08:59:16 +0100
commitb5f6712c5cffacc0366fae1884577f7679c74d83 (patch)
treeddb483bd3fe9429264c7a7ebcc29eb2c6c110312
parentcbe84363d5ef7dee531b2bbb2c54ec4cc09981d1 (diff)
tests: fix interfaces-content-circular testdefault-plugin-provider
-rw-r--r--tests/lib/snaps/test-snapd-content-circular1/meta/snap.yaml2
-rw-r--r--tests/lib/snaps/test-snapd-content-circular2/meta/snap.yaml2
-rw-r--r--tests/main/interfaces-content-circular/task.yaml4
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib/snaps/test-snapd-content-circular1/meta/snap.yaml b/tests/lib/snaps/test-snapd-content-circular1/meta/snap.yaml
index c770d5a39f..2d8fa8c67f 100644
--- a/tests/lib/snaps/test-snapd-content-circular1/meta/snap.yaml
+++ b/tests/lib/snaps/test-snapd-content-circular1/meta/snap.yaml
@@ -8,7 +8,7 @@ plugs:
content-plug:
interface: content
target: import
- content: circular1
+ content: circular2
default-provider: test-snapd-content-circular2
slots:
content-slot:
diff --git a/tests/lib/snaps/test-snapd-content-circular2/meta/snap.yaml b/tests/lib/snaps/test-snapd-content-circular2/meta/snap.yaml
index 4e9730f9d3..dc78302148 100644
--- a/tests/lib/snaps/test-snapd-content-circular2/meta/snap.yaml
+++ b/tests/lib/snaps/test-snapd-content-circular2/meta/snap.yaml
@@ -8,7 +8,7 @@ plugs:
content-plug:
interface: content
target: import
- content: circular2
+ content: circular1
default-provider: test-snapd-content-circular1
slots:
content-slot:
diff --git a/tests/main/interfaces-content-circular/task.yaml b/tests/main/interfaces-content-circular/task.yaml
index fcde4e5cf1..99b2e3cd2c 100644
--- a/tests/main/interfaces-content-circular/task.yaml
+++ b/tests/main/interfaces-content-circular/task.yaml
@@ -10,9 +10,9 @@ execute: |
echo "Then the snap is listed as connected"
snap interfaces
- CONNECTED_PATTERN_1="test-snapd-content-circular1:shared-content-slot +test-snapd-content-circular1:shared-content-plug"
+ CONNECTED_PATTERN_1="test-snapd-content-circular1:content-slot +test-snapd-content-circular2:content-plug"
snap interfaces | MATCH "$CONNECTED_PATTERN_1"
- CONNECTED_PATTERN_2="test-snapd-content-circular2:shared-content-slot +test-snapd-content-circular2:shared-content-plug"
+ CONNECTED_PATTERN_2="test-snapd-content-circular2:content-slot +test-snapd-content-circular1:content-plug"
snap interfaces | MATCH "$CONNECTED_PATTERN_2"