From 0f3122f75fe934276c0e8672f11b8d0a8abada11 Mon Sep 17 00:00:00 2001
From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Wed, 29 Nov 2023 22:24:39 -0500
Subject: [PATCH] device-mapper-multipath-0.9.7-3

Fix multipath_conf_syntax test
Fix restate_module test
Fix find_multipaths test
---
 device-mapper-multipath.spec        | 6 +++++-
 tests/find_multipaths/main.sh       | 1 +
 tests/multipath_conf_syntax/main.sh | 2 +-
 tests/restate_module/main.sh        | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index aea93d7..1fdaa06 100644
--- a/device-mapper-multipath.spec
+++ b/device-mapper-multipath.spec
@@ -1,6 +1,6 @@
 Name:    device-mapper-multipath
 Version: 0.9.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tools to manage multipath devices using device-mapper
 License: GPLv2
 URL:     http://christophe.varoqui.free.fr/
@@ -231,6 +231,10 @@ fi
 %{_pkgconfdir}/libdmmp.pc
 
 %changelog
+* Wed Nov 29 2023 Benjamin Marzinski <bmarzins@redhat.com> - 0.9.7-3
+- Fix multipath_conf_syntax test
+- Fix restate_module test
+
 * Tue Nov 28 2023 Paul Donohue <git@PaulSD.com> - 0.9.7-2
 - Modify 0006-RH-add-mpathconf.patch
 - Modify 0008-RH-reset-default-find_mutipaths-value-to-off.patch
diff --git a/tests/find_multipaths/main.sh b/tests/find_multipaths/main.sh
index a39af79..4d94c87 100755
--- a/tests/find_multipaths/main.sh
+++ b/tests/find_multipaths/main.sh
@@ -40,6 +40,7 @@ rpm -q device-mapper-multipath || yum install -y device-mapper-multipath
 # test with find_multipath=y, will not multipath for the single device; reload/start the service to enable the config
 cleanup
 trun "rm -f /etc/multipath.conf"
+trun "rm -f /etc/multipath/wwids"
 trun "mpathconf --enable --user_friendly_names y --find_multipaths y --with_multipathd n"
 sed -i '/^blacklist[[:space:]]*{/ a\
 	device {\n              vendor ".*"\n           product ".*"\n  }
diff --git a/tests/multipath_conf_syntax/main.sh b/tests/multipath_conf_syntax/main.sh
index 331d65e..fb303c3 100755
--- a/tests/multipath_conf_syntax/main.sh
+++ b/tests/multipath_conf_syntax/main.sh
@@ -119,7 +119,7 @@ tok "multipath -ll | grep mypath"
 
 # test wrong alias keyword
 trun "sed -i 's/alias.*$/alia mypath/g' /etc/multipath.conf"
-tok "multipath 2>&1 | grep 'invalid keyword: alia'"
+tok "multipath 2>&1 | grep 'invalid keyword in the multipath section: alia'"
 trun "multipath -r"
 tok "multipath -ll | grep mpath"
 trun "sed -i 's/alia.*$/alias mypath/g' /etc/multipath.conf"
diff --git a/tests/restate_module/main.sh b/tests/restate_module/main.sh
index 7f3279d..565e59c 100755
--- a/tests/restate_module/main.sh
+++ b/tests/restate_module/main.sh
@@ -69,7 +69,7 @@ tlog "Checking if active path count equals 2"
 assert "[[ $pathcount -eq 2 ]]"
 
 tlog "offline one path device"
-pathname=`multipathd show paths raw format "%d %m" | grep ${mpathdev} | head -1 | awk '{print $1}'`
+pathname=`multipathd show paths raw format "%d %m %p" | grep ${mpathdev} | sort -k 3n | head -1 | awk '{print $1}'`
 tlog "path to offline: ${pathname}"
 trun "echo 'offline' > /sys/block/${pathname}/device/state"
 tlog "waiting for multipathd to fail path"