From 17d1ae7ee233587720662dbd01bfc7939898f161 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Tue, 14 Sep 2004 15:23:42 +0000
Subject: [PATCH] Suppress pvmove abort message in test mode.

---
 WHATS_NEW      | 1 +
 tools/pvmove.c | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index 147b7cf2e..010b1c444 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.00.23 - 
 ====================================
+  Suppress pvmove abort message in test mode.
   Improve pvcreate/remove device not found error message.
   Allow pvmove to move data within the same PV.
   Describe how pvmove works on man page.
diff --git a/tools/pvmove.c b/tools/pvmove.c
index 0823a1de7..38017db4f 100644
--- a/tools/pvmove.c
+++ b/tools/pvmove.c
@@ -231,8 +231,10 @@ static int _update_metadata(struct cmd_context *cmd, struct volume_group *vg,
 	/* Only the first mirror segment gets activated as a mirror */
 	if (first_time) {
 		if (!activate_lv(cmd, lv_mirr->lvid.s)) {
-			log_error("ABORTING: Temporary mirror activation "
-				  "failed.  Run pvmove --abort.");
+			if (!test_mode())
+				log_error("ABORTING: Temporary mirror "
+					  "activation failed.  "
+					  "Run pvmove --abort.");
 			/* FIXME Resume using *original* metadata here! */
 			resume_lvs(cmd, lvs_changed);
 			return 0;