diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2019-02-14 19:12:14 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2019-02-14 19:12:14 +0100 |
| commit | 2495edc4e3241aa37b63a92011f9e9e13c6ddab9 (patch) | |
| tree | 79a81a3ef29160c569976a5f73c941a43009714a | |
| parent | 30df251f82b98a4dc6b9d7113d603b9ec21d4b89 (diff) | |
| parent | 22ca81a34bcbc3e7a0d48ff7821b8462d8c2cb53 (diff) | |
Merge remote-tracking branch 'upstream/master' into debhelper-oh-pleasedebhelper-oh-please
| -rw-r--r-- | tests/main/apt-hooks/task.yaml | 4 | ||||
| -rw-r--r-- | tests/main/catalog-update/task.yaml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/main/apt-hooks/task.yaml b/tests/main/apt-hooks/task.yaml index 054a4bca55..710a1b8b2a 100644 --- a/tests/main/apt-hooks/task.yaml +++ b/tests/main/apt-hooks/task.yaml @@ -9,6 +9,10 @@ debug: | strings /var/cache/snapd/commands.db | sed -e 's#"}\(]\)\?#"}\1\n#g' execute: | + # FIXME: remove this once the store is in good shape again + echo "the store is unhappy right now" + exit 0 + echo "Ensure we have a snap catalog in our cache" while ! test -s /var/cache/snapd/commands.db; do sleep 1 diff --git a/tests/main/catalog-update/task.yaml b/tests/main/catalog-update/task.yaml index 6a53ed227c..96921c4d40 100644 --- a/tests/main/catalog-update/task.yaml +++ b/tests/main/catalog-update/task.yaml @@ -9,6 +9,10 @@ execute: | # shellcheck source=tests/lib/journalctl.sh . "$TESTSLIB/journalctl.sh" + # FIXME: remove this once the store is in good shape again + echo "the store is unhappy right now" + exit 0 + echo "We count how many catalog refreshes are logged before starting snapd" refreshes_before="$(get_journalctl_log -u snapd | grep -c 'Catalog refresh' || true)" |