device-mapper-multipath-0.9.9-8

Fix multipath_conf_syntax OSCI test.
Related: RHEL-82180

device-mapper-multipath.spec

@@ -1,6 +1,6 @@
 Name:    device-mapper-multipath
 Version: 0.9.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Tools to manage multipath devices using device-mapper
 License: GPLv2
 URL:     http://christophe.varoqui.free.fr/
@@ -248,6 +248,10 @@ fi
 %{_pkgconfdir}/libdmmp.pc
 
 %changelog
+* Wed Mar 12 2025 Benjamin Marzinski <bmarzins@redhat.com> - 0.9.9-8
+- Fix multipath_conf_syntax OSCI test.
+- Related: RHEL-82180
+
 * Thu Mar  6 2025 Benjamin Marzinski <bmarzins@redhat.com> - 0.9.9-7
 - Add 0018-multipath-tools-move-DEFAULT_SOCKET-definition-into-.patch
 - Add 0019-multipath-tools-add-helper-mpath_fill_sockaddr__.patch

tests/multipath_conf_syntax/main.sh

@@ -44,6 +44,12 @@ assert ()
 	fi
 }
 
+do_reconfigure ()
+{
+	tok "multipathd reconfigure"
+	sleep 5
+}
+
 rpm -q device-mapper-multipath || yum install -y device-mapper-multipath
 
 # cleanup existing devices and restart
@@ -89,47 +95,46 @@ multipaths {
 }
 _EOF_
 tok "multipath 2>&1 | grep 'missing closing quotes on line'"
-trun "multipath -r"
+do_reconfigure
 tok "multipath -ll | grep mypath"
 
 # test no value for alias
 trun "sed -i 's/alias.*$/alias/g' /etc/multipath.conf"
-multipath
 tok "multipath 2>&1 | grep \"missing value for option 'alias' on line\""
-trun "multipath -r"
+do_reconfigure
 tok "multipath -ll | grep mpath"
 
 # test missing starting quote on alias
 trun "sed -i 's/alias.*$/alias mypath\"/g' /etc/multipath.conf"
 tok "multipath 2>&1 |grep 'ignoring extra data starting with'"
-trun "multipath -r"
+do_reconfigure
 tok "multipath -ll | grep mypath"
 
 # test wrong quote on alias
 trun "sed -i 's/alias.*$/alias <mypath>/g' /etc/multipath.conf"
 tnot "multipath 2>&1 | grep config"
-trun "multipath -r"
+do_reconfigure
 tok "multipath -ll | grep '<mypath>'"
 
 # test value has a space
 trun "sed -i 's/alias.*$/alias mypath test/g' /etc/multipath.conf"
 tok "multipath 2>&1 |grep 'ignoring extra data starting with'"
-trun "multipath -r"
+do_reconfigure
 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 in the multipath section: alia'"
-trun "multipath -r"
+do_reconfigure
 tok "multipath -ll | grep mpath"
 trun "sed -i 's/alia.*$/alias mypath/g' /etc/multipath.conf"
 
 # test no space between the section name and the open bracket that followed it
 # fix issue about if a section doesn't have a space between the section name
 # and the open bracket, that section isn't read in.
-trun "sed -i 's/multipaths.*/multipaths{/g' /etc/multipath.conf"
+trun "sed -i 's/^multipaths.*/multipaths{/g' /etc/multipath.conf"
 tnot "multipath 2>&1 | grep config"
-trun "multipath -r"
+do_reconfigure
 tok "multipath -ll |grep mypath"
 
 # test wrong section keywords