[WIP] test: Call mkdir before creating files

Makefile.in

@@ -109,7 +109,7 @@ rpm: dist
 	$(LN_S) -f $(abs_top_srcdir)/spec/macros.inc $(rpmbuilddir)/SOURCES
 	$(LN_S) -f $(abs_top_srcdir)/spec/packages.inc $(rpmbuilddir)/SOURCES
 	DM_VER=$$(cut -d- -f1 $(top_srcdir)/VERSION_DM);\
-	GIT_VER=$$(cd $(top_srcdir); git describe | cut -d- --output-delimiter=. -f2,3 || echo 0);\
+	GIT_VER=$$(cd $(top_srcdir); git describe | cut -d- --output-delimiter=. -f2- || echo 0);\
 	sed -e "s,\(device_mapper_version\) [0-9.]*$$,\1 $$DM_VER," \
 	    -e "s,^\(Version:[^0-9%]*\)[0-9.]*$$,\1 $(LVM_VER)," \
 	    -e "s,^\(Release:[^0-9%]*\)[0-9.]\+,\1 $$GIT_VER," \

test/lib/aux.sh

@@ -41,6 +41,8 @@ create_corosync_conf() {
 		else
 			mv "$COROSYNC_CONF" "$COROSYNC_CONF.prelvmtest"
 		fi
+	else
+		mkdir -p "$(dirname $COROSYNC_CONF)"
 	fi
 
 	sed -e "s/@LOCAL_NODE@/$COROSYNC_NODE/" lib/test-corosync-conf > "$COROSYNC_CONF"
@@ -55,6 +57,8 @@ create_dlm_conf() {
 		else
 			mv "$DLM_CONF" "$DLM_CONF.prelvmtest"
 		fi
+	else
+		mkdir -p "$(dirname $DLM_CONF)"
 	fi
 
 	cp lib/test-dlm-conf "$DLM_CONF"
@@ -154,6 +158,18 @@ prepare_lvmlockd() {
 		echo "Failed to start lvmlockd"
 		exit 1
 	fi
+
+	for i in {200..0} ; do
+		test "$i" -eq 0 && die "Startup of lvmlockd is too slow."
+		test -e "/run/lvm/lvmlockd.socket" && break
+		echo -n .;
+		sleep .1;
+	done # wait for the socket
+
+	# NOTE: Found in lvmlockd(8) man page:
+	vgchange --lock-start
+
+	echo ok
 }
 
 prepare_clvmd() {
@@ -518,16 +534,6 @@ teardown() {
 
 	kill_tagged_processes
 
-	if test -n "$LVM_TEST_LVMLOCKD_TEST" ; then
-		echo ""
-		echo "## stopping lvmlockd in teardown"
-		killall lvmlockd
-		sleep 1
-		killall lvmlockd || true
-		sleep 1
-		killall -9 lvmlockd || true
-	fi
-
 	dm_table | not grep -E -q "$vg|$vg1|$vg2|$vg3|$vg4" || {
 		# Avoid activation of dmeventd if there is no pid
 		cfg=$(test -s LOCAL_DMEVENTD || echo "--config activation{monitoring=0}")
@@ -539,6 +545,26 @@ teardown() {
 		fi
 	}
 
+	# NOTE: Found in lvmlockd(8) man page:
+	vgchange --lock-stop
+
+	# NOTE: Should this come after vgremove?
+	if test -n "$LVM_TEST_LVMLOCKD_TEST" ; then
+		echo ""
+		echo "## stopping lvmlockd in teardown"
+		# NOTE: Found in zz-lvmlockd-dlm-remove.sh:
+		lvmlockctl --stop-lockspaces
+		killall lvmlockd
+		sleep 1
+		killall lvmlockd || true
+		sleep 1
+		killall -9 lvmlockd || true
+	fi
+
+	# NOTE: Found in zz-lvmlockd-dlm-remove.sh:
+	systemctl stop dlm
+	systemctl stop corosync
+
 	kill_sleep_kill_ LOCAL_LVMDBUSD 0
 
 	echo -n .

test/lib/inittest.sh

@@ -175,6 +175,7 @@ fi
 # aa-lvmlockd-{sanlock,dlm}-prepare.sh and left running for all shell tests.
 
 if test -n "$LVM_TEST_LVMLOCKD_TEST" ; then
+	aux prepare_dlm
 	aux prepare_lvmlockd
 fi