From 483ff8104d0311bdf92dd24b169e435e027ffa9f Mon Sep 17 00:00:00 2001 From: eutarass Date: Tue, 4 Jan 2011 17:28:33 +0000 Subject: TCF Tests: fixed: the test suite code should not make its internal peers info visible to discovery code. --- tests/test-all | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/test-all') diff --git a/tests/test-all b/tests/test-all index 471a5d2d6..4c54f6b5f 100755 --- a/tests/test-all +++ b/tests/test-all @@ -249,8 +249,8 @@ function build_and_test_agent() fi $SSH "$TRUNK/agent/obj/$OPSYS/$MACHINE/$CONF/agent -s TCP::1534 $AGENT_L_OPT -l0" >>logs/$LOGFILE 2>&1 & sleep 15 - TESTURL1=ID=Test-Agent-$HOST-$SEQ:TransportName=TCP:Host=$HOST:Port=1534 - TESTURL2=ID=Test-Proxy-$HOST-$SEQ:TransportName=TCP:Host=$HOST:Port=1535 + TESTURL1=TransportName=TCP:Host=$HOST:Port=1534 + TESTURL2=TransportName=TCP:Host=$HOST:Port=1535 echo >>logs/$LOGFILE echo "Starting tests, target: $TESTURL1" >>logs/$LOGFILE @@ -288,25 +288,25 @@ function build_and_test_agent() continue fi local AGENT_S_OPT=PIPE: - TESTURL1=ID=Test-Agent-$HOST-$SEQ-$PROTO:TransportName=PIPE + TESTURL1=TransportName=PIPE ;; UNIX) if [ "$OPSYS" != GNU/Linux ] ; then continue; fi local AGENT_S_OPT=UNIX:/tmp/tcf - TESTURL1=ID=Test-Agent-$HOST-$SEQ-$PROTO:TransportName=UNIX:Host=/tmp/tcf + TESTURL1=TransportName=UNIX:Host=/tmp/tcf ;; SSL) if [ "$OPSYS" != GNU/Linux ] ; then continue; fi local AGENT_S_OPT=SSL::1534 - TESTURL1=ID=Test-Agent-$HOST-$SEQ-$PROTO:TransportName=SSL:Host=localhost:Port=1534 + TESTURL1=TransportName=SSL:Host=localhost:Port=1534 ;; *) local AGENT_S_OPT=TCP::1534 - TESTURL1=ID=Test-Agent-$HOST-$SEQ-$PROTO:TransportName=TCP:Host=localhost:Port=1534 + TESTURL1=TransportName=TCP:Host=localhost:Port=1534 ;; esac $SSH "$TRUNK/agent/obj/$OPSYS/$MACHINE/$CONF/agent -s $AGENT_S_OPT $AGENT_L_OPT -l0" >>logs/$LOGFILE 2>&1 & -- cgit v1.2.3