Fix regression test when re-exec kicks in #120

Merged
merged 2 commits into from Aug 26, 2016
Jump to file or symbol
Failed to load files and symbols.
+4 −0
Split
@@ -13,6 +13,7 @@ prepare: |
cd /
echo "Install hello-world"
snap install hello-world
+ systemctl stop snapd.refresh.timer snapd.service snapd.socket
# all of this ls madness can go away when we have remote environment
# variables
echo "Unmount original core snap"
@@ -26,6 +27,7 @@ prepare: |
if [ ! -e $(ls -1 /var/lib/snapd/snaps/ubuntu-core_*.snap | tail -1) ]; then exit 1; fi
echo "Mount modified core snap"
mount $(ls -1 /var/lib/snapd/snaps/ubuntu-core_*.snap | tail -1) $(ls -1d /snap/ubuntu-core/* | grep -v current | tail -1)
+ systemctl start snapd.refresh.timer snapd.service snapd.socket
execute: |
cd /
echo "Add a udev tag so affected code branch is exercised"
@@ -43,6 +45,7 @@ execute: |
restore: |
echo "Remove hello-world"
snap remove hello-world
+ systemctl stop snapd.refresh.timer snapd.service snapd.socket
echo "Unmount the modified core snap"
# all of this ls madness can go away when we have remote environment
# variables
@@ -57,3 +60,4 @@ restore: |
udevadm settle
udevadm trigger
udevadm settle
+ systemctl start snapd.refresh.timer snapd.service snapd.socket