test: lvmetad-warning

The test was a weak attempt at verifying the special
combination of lvchange/vgchange -aay --sysinit, but
was only looking for lvmetad connection warnings.

Update the warning checks, and check the LV activation
state directly which is the main point.

Rename the test to reflect its purpose of checking
the -aay --sysinit combination.

2 files changed, 91 insertions, 36 deletions

diff --git a/test/shell/lvmetad-sysinit.sh b/test/shell/lvmetad-sysinit.sh
new file mode 100644
index 000000000..442f7285c
--- /dev/null
+++ b/test/shell/lvmetad-sysinit.sh
@@ -0,0 +1,91 @@
+#!/bin/sh
+# Copyright (C) 2012 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+SKIP_WITH_LVMLOCKD=1
+SKIP_WITHOUT_LVMETAD=1
+SKIP_WITH_LVMPOLLD=1
+
+. lib/inittest
+
+aux prepare_pvs 2
+
+#
+# lvchange/vgchange -aay --sysinit should not activate LVs
+# if lvmetad is configured and running.
+#
+
+vgcreate $vg1 "$dev1" "$dev2"
+lvcreate -an -l1 --zero n -n $lv1 $vg1
+
+#
+# lvmetad is configured and running
+#
+
+lvchange -ay $vg1 2>&1 | tee out
+not grep "WARNING: Failed to connect" out
+not grep "WARNING: lvmetad is active, skipping direct activation during sysinit" out
+check active $vg1 $lv1
+lvchange -an $vg1
+check inactive $vg1 $lv1
+
+lvchange -aay --sysinit $vg1 2>&1 | tee out
+not grep "WARNING: Failed to connect" out
+grep "WARNING: lvmetad is active, skipping direct activation during sysinit" out
+check inactive $vg1 $lv1
+
+lvchange -ay --sysinit $vg1 2>&1 | tee out
+not grep "WARNING: Failed to connect" out
+not grep "WARNING: lvmetad is active, skipping direct activation during sysinit" out
+check active $vg1 $lv1
+lvchange -an $vg1
+check inactive $vg1 $lv1
+
+#
+# lvmetad is configured and not running
+#
+
+kill $(< LOCAL_LVMETAD)
+
+lvchange -ay $vg1 2>&1 | tee out
+grep "WARNING: Failed to connect" out
+not grep "WARNING: lvmetad is active, skipping direct activation during sysinit" out
+check active $vg1 $lv1
+lvchange -an $vg1
+check inactive $vg1 $lv1
+
+lvchange -aay --sysinit $vg1 2>&1 | tee out
+grep "WARNING: Failed to connect" out
+not grep "WARNING: lvmetad is active, skipping direct activation during sysinit" out
+check active $vg1 $lv1
+lvchange -an $vg1
+check inactive $vg1 $lv1
+
+#
+# lvmetad is not configured and not running
+#
+
+aux lvmconf 'global/use_lvmetad = 0'
+
+lvchange -ay $vg1 2>&1 | tee out
+not grep "WARNING: Failed to connect" out
+not grep "WARNING: lvmetad is active, skipping direct activation during sysinit" out
+check active $vg1 $lv1
+lvchange -an $vg1
+check inactive $vg1 $lv1
+
+lvchange -aay $vg1 --sysinit 2>&1 | tee out
+not grep "WARNING: Failed to connect"
+not grep "WARNING: lvmetad is active, skipping direct activation during sysinit" out
+check active $vg1 $lv1
+lvchange -an $vg1
+check inactive $vg1 $lv1
+
+vgremove -ff $vg1
diff --git a/test/shell/lvmetad-warning.sh b/test/shell/lvmetad-warning.sh
deleted file mode 100644
index e631f9c9b..000000000
--- a/test/shell/lvmetad-warning.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2012 Red Hat, Inc. All rights reserved.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-SKIP_WITH_LVMLOCKD=1
-SKIP_WITHOUT_LVMETAD=1
-SKIP_WITH_LVMPOLLD=1
-
-. lib/inittest
-
-aux prepare_pvs 2
-
-vgcreate $vg1 "$dev1" "$dev2"
-lvchange -ay $vg1 2>&1 | not grep "Failed to connect"
-
-kill $(< LOCAL_LVMETAD)
-lvchange -ay $vg1 2>&1 | grep "Failed to connect"
-lvchange -aay $vg1 --sysinit 2>&1 | tee sysinit.txt
-not grep "Failed to connect" sysinit.txt
-
-aux lvmconf 'global/use_lvmetad = 0'
-lvchange -ay $vg1 2>&1 | not grep "Failed to connect"
-lvchange -ay $vg1 --sysinit 2>&1 | not grep "Failed to connect"
-
-aux prepare_lvmetad
-lvchange -ay $vg1 2>&1 | not grep "Failed to connect"
-lvchange -ay $vg1 --sysinit 2>&1 | not grep "Failed to connect"
-
-vgremove -ff $vg1