From a1c5b68e19f348341deb7f8052fe7cfb6ea425d7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Oct 2016 11:58:57 +0200 Subject: [PATCH] snap: switch the auto-import dir to /run/snapd/auto-import --- dirs/dirs.go | 2 +- tests/main/snap-auto-import-asserts-spools/task.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dirs/dirs.go b/dirs/dirs.go index 24122dc38a2..21de534727c 100644 --- a/dirs/dirs.go +++ b/dirs/dirs.go @@ -123,7 +123,7 @@ func SetRootDir(rootdir string) { SnapSocket = filepath.Join(rootdir, "/run/snapd-snap.socket") SnapAssertsDBDir = filepath.Join(rootdir, snappyDir, "assertions") - SnapAssertsSpoolDir = filepath.Join(rootdir, snappyDir, "auto-import") + SnapAssertsSpoolDir = filepath.Join(rootdir, "run/snapd/auto-import") SnapStateFile = filepath.Join(rootdir, snappyDir, "state.json") diff --git a/tests/main/snap-auto-import-asserts-spools/task.yaml b/tests/main/snap-auto-import-asserts-spools/task.yaml index 898075b7833..0f35e957125 100644 --- a/tests/main/snap-auto-import-asserts-spools/task.yaml +++ b/tests/main/snap-auto-import-asserts-spools/task.yaml @@ -35,7 +35,7 @@ execute: | echo "`snap auto-import` spooled assertions if it can not talk to snapd" snap auto-import - ls /var/lib/snapd/auto-import + ls /run/snapd/auto-import umount /mnt systemctl start snapd.service snapd.socket @@ -43,9 +43,9 @@ execute: | snap auto-import snap known account-key | grep "name: test-store" - nr=$(ls /var/lib/snapd/auto-import|wc -l) + nr=$(ls /run/snapd/auto-import|wc -l) if [ "$nr" != "0" ]; then - echo "Expected an empty /var/lib/snapd/auto-import got:" - ls /var/lib/snapd/auto-import + echo "Expected an empty /run/snapd/auto-import got:" + ls /run/snapd/auto-import exit 1 fi \ No newline at end of file