summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2016-04-19 09:18:31 -0500
committerDavid Teigland <teigland@redhat.com>2016-04-19 11:45:19 -0500
commitc9cf85f606d14bcffdbdfaf19e0fa3a8e8b2a5d3 (patch)
tree47ed363fb840e6cb5bf9eaba5921d7607a8a347a
parent2a17610899f6dc5d5e5acf5f0a4b427f2cdfeea8 (diff)
downloadlvm2-c9cf85f606d14bcffdbdfaf19e0fa3a8e8b2a5d3.tar.gz
test: update lvm1 test
Make it a generic lvm1 test, which should work with or without lvmetad now that lvmetad is just disabled when lvm1 is used.
-rw-r--r--test/shell/lvm1-basic.sh (renamed from test/shell/lvmetad-lvm1.sh)10
1 files changed, 3 insertions, 7 deletions
diff --git a/test/shell/lvmetad-lvm1.sh b/test/shell/lvm1-basic.sh
index 824c1d54f..8884bc101 100644
--- a/test/shell/lvmetad-lvm1.sh
+++ b/test/shell/lvm1-basic.sh
@@ -15,19 +15,15 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
-# lvmetad does not support lvm1 format
-
aux prepare_devs 2
pvcreate --metadatatype 1 "$dev1"
-should not vgscan --cache
pvs | tee out
-not grep "$dev1" out
+grep "$dev1" out
vgcreate --metadatatype 1 $vg1 "$dev1"
-should not vgscan --cache
vgs | tee out
-not grep $vg1 out
+grep $vg1 out
pvs | tee out
-not grep "$dev1" out
+grep "$dev1" out
# check for RHBZ 1080189 -- SEGV in lvremove/vgremove
pvcreate -ff -y --metadatatype 1 "$dev1" "$dev2"