[Ocfs2-test-devel] [PATCH 47/59] lvb-test: fix test failure

[Junxiao Bi]

This test needs write persmission to /dlm which is owned by "root",
so sudo is needed to run the test. The second failure is for the
heartbeat device, this device had been actived before the test, so
no need start it in the test.

Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com>
---
 programs/python_common/multiple_run.sh |    2 +-
 programs/python_common/o2tf.py         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/python_common/multiple_run.sh b/programs/python_common/multiple_run.sh
index 101dcb0..70c9866 100755
--- a/programs/python_common/multiple_run.sh
+++ b/programs/python_common/multiple_run.sh
@@ -429,7 +429,7 @@ ${DEVICE} ${FEATURES} ${JOURNALSIZE} ${BLOCKS}
 
 	LogMsg "Run lvb_torture, CMD: ${BINDIR}/run_lvb_torture.py -d /dlm/ -i 60000 \
 -H ${DEVICE} -l ${logfile} -n ${NODE_LIST} "${UUID}" "${LOCK}""
-	${BINDIR}/run_lvb_torture.py -d /dlm/ -c 60000 -i ${INTERFACE} -H ${DEVICE} -l \
+	${SUDO} ${BINDIR}/run_lvb_torture.py -d /dlm/ -c 60000 -i ${INTERFACE} -l \
 ${logfile} -n ${NODE_LIST} "${UUID}" "${LOCK}" >> ${LOGFILE} 2>&1
 	LogRC $?
 
diff --git a/programs/python_common/o2tf.py b/programs/python_common/o2tf.py
index 4da4172..7eb1ed0 100644
--- a/programs/python_common/o2tf.py
+++ b/programs/python_common/o2tf.py
@@ -282,7 +282,7 @@ def openmpi_run(DEBUGON, nproc, cmd, nodes, remote_sh, interface, logfile, w_fla
 				logfile, 0, '')
 		pid = os.spawnv(os.P_NOWAIT,
 			'/bin/bash', ['bash', '-xc',
-			config.MPIRUN + ' -mca btl tcp,self %s %s %s --host %s %s' % \
+			config.MPIRUN + ' --allow-run-as-root -mca btl tcp,self %s %s %s --host %s %s' % \
 			(shopt, iface, nprocopt, nodes, cmd)])
 		if w_flag == 'NOWAIT':
 			return pid
-- 
1.7.9.5