diff options
| -rw-r--r-- | tests/bugs/bug-1109770.t | 8 | ||||
| -rwxr-xr-x | tests/snapshot.rc | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tests/bugs/bug-1109770.t b/tests/bugs/bug-1109770.t index c9490a63654..03b929defda 100644 --- a/tests/bugs/bug-1109770.t +++ b/tests/bugs/bug-1109770.t @@ -44,9 +44,7 @@ TEST $CLI snapshot create snap4 $V0; TEST $CLI volume set $V0 features.uss enable; -SNAPD_PID=$(ps auxww | grep snapd | grep -v grep | awk '{print $2}'); - -TEST [ $SNAPD_PID -gt 0 ]; +EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Y' check_if_snapd_exist TEST $CLI volume set $V0 features.uss disable; @@ -56,9 +54,7 @@ TEST ! [ $SNAPD_PID -gt 0 ]; TEST $CLI volume set $V0 features.uss enable; -SNAPD_PID=$(ps auxww | grep snapd | grep -v grep | awk '{print $2}'); - -TEST [ $SNAPD_PID -gt 0 ]; +EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Y' check_if_snapd_exist TEST $CLI volume stop $V0; diff --git a/tests/snapshot.rc b/tests/snapshot.rc index a1657162fd4..5186b77fe04 100755 --- a/tests/snapshot.rc +++ b/tests/snapshot.rc @@ -385,6 +385,12 @@ function snap_config() $cli_index snapshot config | grep "^$var" | sed 's/.*: //' } +function check_if_snapd_exist() { + local pid + pid=$(ps aux | grep "snapd" | grep -v grep | awk '{print $2}') + if [ -n "$pid" ]; then echo "Y"; else echo "N"; fi +} + case $OSTYPE in NetBSD) echo "Skip test on LVM which is not available on NetBSD" >&2 |