Index: trunk/test/testrun_2g.sh
===================================================================
--- trunk/test/testrun_2g.sh	(revision 576)
+++ trunk/test/testrun_2g.sh	(revision 577)
@@ -204,5 +204,8 @@
 	UUID=$(uuidgen)
 	mv ./file.delta file.${SH_LOCALHOST}.${UUID}
-	cp file.${SH_LOCALHOST}.${UUID} "./file.${ALTHOST}.${UUID}"
+	if [ "x${SH_LOCALHOST}" != "x${ALTHOST}" ]
+	then
+	    cp file.${SH_LOCALHOST}.${UUID} "./file.${ALTHOST}.${UUID}"
+	fi
 	
 	#
@@ -223,4 +226,6 @@
 	fi
 
+	NHOSTS=1
+	
 	./yulectl -c "DELTA:${UUID}" ${SH_LOCALHOST}
 	if [ $? -ne 0 ]; then
@@ -229,12 +234,18 @@
 	    return 1
 	fi
-	./yulectl -c "DELTA:${UUID}" ${ALTHOST}
-	if [ $? -ne 0 ]; then
-	    [ -z "$verbose" ] || log_msg_fail "yulectl (2)";
-	    kill $PROC_S; kill $PROC_Y;
-	    return 1
-	fi
+
+	if [ "x${SH_LOCALHOST}" != "x${ALTHOST}" ]
+	then
+	    ./yulectl -c "DELTA:${UUID}" ${ALTHOST}
+	    NHOSTS=2
+	    if [ $? -ne 0 ]; then
+		[ -z "$verbose" ] || log_msg_fail "yulectl (2)";
+		kill $PROC_S; kill $PROC_Y;
+		return 1
+	    fi
+	fi
+	
 	NR=$( ./yulectl -c LIST | grep ${UUID} | grep -v grep | wc -l )
-	if [ $NR -ne 2 ]; then
+	if [ $NR -ne $NHOSTS ]; then
 	    [ -z "$verbose" ] || log_msg_fail "yulectl (3)";
 	    [ -z "$verbose" ] || ./yulectl -c LIST
@@ -249,5 +260,6 @@
 	done
 	#
-	NR=$( ./yulectl -c LIST | grep ${UUID} | grep -v grep | wc -l )
+	NR=$( ./yulectl -c LISTALL | grep ${UUID} | grep SENT | grep -v grep | wc -l )
+	# NR=$( ./yulectl -c LIST | grep ${UUID} | grep -v grep | wc -l )
 	if [ $NR -ne 1 ]; then
 	    [ -z "$verbose" ] || log_msg_fail "yulectl (4)";
@@ -330,5 +342,8 @@
 	else
 	    mv ./file.delta file.${SH_LOCALHOST}.${UUID}
-	    cp file.${SH_LOCALHOST}.${UUID} "./file.${ALTHOST}.${UUID}"
+	    if [ "x${SH_LOCALHOST}" != "x${ALTHOST}" ]
+	    then
+		cp file.${SH_LOCALHOST}.${UUID} "./file.${ALTHOST}.${UUID}"
+	    fi
 	fi
 	[ -z "$verbose" ] || log_msg_ok    "... DeltaDB copied as file.${SH_LOCALHOST}.${UUID} ...";
@@ -351,4 +366,6 @@
 	fi
 
+	NHOSTS=1
+	
 	./yulectl -c "DELTA:${UUID}" ${SH_LOCALHOST}
 	if [ $? -ne 0 ]; then
@@ -357,12 +374,18 @@
 	    return 1
 	fi
-	./yulectl -c "DELTA:${UUID}" ${ALTHOST}
-	if [ $? -ne 0 ]; then
-	    [ -z "$verbose" ] || log_msg_fail "yulectl (2)";
-	    kill $PROC_S; kill $PROC_Y;
-	    return 1
-	fi
+	
+	if [ "x${SH_LOCALHOST}" != "x${ALTHOST}" ]
+	then
+	    ./yulectl -c "DELTA:${UUID}" ${ALTHOST}
+	    NHOSTS=2
+	    if [ $? -ne 0 ]; then
+		[ -z "$verbose" ] || log_msg_fail "yulectl (2)";
+		kill $PROC_S; kill $PROC_Y;
+		return 1
+	    fi
+	fi
+	
 	NR=$( ./yulectl -c LIST | grep ${UUID} | grep -v grep | wc -l )
-	if [ $NR -ne 2 ]; then
+	if [ $NR -ne $NHOSTS ]; then
 	    [ -z "$verbose" ] || log_msg_fail "yulectl (3)";
 	    [ -z "$verbose" ] || ./yulectl -c LIST
@@ -378,12 +401,14 @@
 	done
 	#
-	NR=$( ./yulectl -c LIST | grep ${UUID} | grep -v grep | wc -l )
+	NR=$( ./yulectl -c LISTALL | grep ${UUID} | grep SENT | grep -v grep | wc -l )
 	if [ $NR -ne 1 ]; then
-	    [ -z "$verbose" ] || log_msg_fail "yulectl (4)";
+	    [ -z "$verbose" ] || log_msg_fail "yulectl (4): ${UUID}";
 	    [ -z "$verbose" ] || ./yulectl -c LISTALL
-	    kill $PROC_S; kill $PROC_Y;
-	    return 1
-	fi
-	[ -z "$verbose" ] || OLINE=$( ./yulectl -c LIST | grep ${UUID} )
+	    [ -z "$verbose" ] || echo "(now just LIST)"
+	    [ -z "$verbose" ] || ./yulectl -c LIST
+	    kill $PROC_S; kill $PROC_Y;
+	    return 1
+	fi
+	[ -z "$verbose" ] || OLINE=$( ./yulectl -c LISTALL | grep ${UUID} )
 	[ -z "$verbose" ] || echo "${OLINE}"
 
@@ -607,8 +632,11 @@
 	chmod 644 ./file.${SH_LOCALHOST}
 
-	cp    ./testrc_2       "./rc.${ALTHOST}"
-	cp    ./file.${SH_LOCALHOST} "./file.${ALTHOST}" 2>/dev/null
-	chmod 644 ./rc.${ALTHOST}
-	chmod 644 ./file.${ALTHOST}
+	if [ "x${SH_LOCALHOST}" != "x${ALTHOST}" ]
+	then
+	    cp    ./testrc_2       "./rc.${ALTHOST}"
+	    cp    ./file.${SH_LOCALHOST} "./file.${ALTHOST}" 2>/dev/null
+	    chmod 644 ./rc.${ALTHOST}
+	    chmod 644 ./file.${ALTHOST}
+	fi
 }