lvmetad: Implement --test (fixes #832033).

diff --git a/WHATS_NEW b/WHATS_NEW
index a09e0769cda357792009c83347bddd575b3903a0..cb3ed90cd07889200ba944e56ecb872b3c703837 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.97 - 
 ===============================
+  Respect --test also when using lvmetad.
   No longer capitalise first LV attribute char for invalid snapshots.
   Allow vgextend to add PVs to a VG that is missing PVs.
   Recognise Micron PCIe SSDs in filter and move array out to device-types.h.

diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c
index 6ef30db118b8db74085be87620724ed12a70afc6..3384ec4fa985a444c0df36459623c291624aa95e 100644 (file)
--- a/lib/cache/lvmetad.c
+++ b/lib/cache/lvmetad.c
@@ -275,7 +275,7 @@ int lvmetad_vg_update(struct volume_group *vg)
        if (!vg)
                return 0;
 
-       if (!_using_lvmetad)
+       if (!_using_lvmetad || test_mode())
                return 1; /* fake it */
 
        /* TODO. This is not entirely correct, since export_vg_to_buffer
@@ -335,7 +335,7 @@ int lvmetad_vg_remove(struct volume_group *vg)
        daemon_reply reply;
        int result;
 
-       if (!_using_lvmetad)
+       if (!_using_lvmetad || test_mode())
                return 1; /* just fake it */
 
        if (!id_write_format(&vg->id, uuid, sizeof(uuid)))
@@ -547,7 +547,7 @@ int lvmetad_pv_found(struct id pvid, struct device *device, const struct format_
        const char *status;
        int result;
 
-       if (!_using_lvmetad)
+       if (!_using_lvmetad || test_mode())
                return 1;
 
        if (!id_write_format(&pvid, uuid, sizeof(uuid)))
@@ -629,7 +629,7 @@ int lvmetad_pv_gone(dev_t device, const char *pv_name, activation_handler handle
        int result;
        int found;
 
-       if (!_using_lvmetad)
+       if (!_using_lvmetad || test_mode())
                return 1;
 
        /*