From cf8baca824e32da57237f693e4a238b247e2f397 Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrewb@zip.com.au>
Date: Mon, 2 Jul 2012 11:00:06 +0930
Subject: [PATCH] Fix dna protocol tests for concurrent execution

---
 tests/dnaprotocol | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/dnaprotocol b/tests/dnaprotocol
index 0887cdd4..8b990910 100755
--- a/tests/dnaprotocol
+++ b/tests/dnaprotocol
@@ -38,8 +38,8 @@ setup_servald_instance() {
    executeOk_servald config set debug.interfaces Yes
    executeOk_servald config set debug.packetformats Yes
    executeOk_servald config set interfaces "+>$2"
-   executeOk_servald config set monitor.socket "org.servalproject.servald.monitor.socket.$instance_name"
-   executeOk_servald config set mdp.socket "org.servalproject.servald.mdp.socket.$instance_name"
+   executeOk_servald config set monitor.socket "org.servalproject.servald.monitor.socket.$TFWUNIQUE.$instance_name"
+   executeOk_servald config set mdp.socket "org.servalproject.servald.mdp.socket.$TFWUNIQUE.$instance_name"
    executeOk_servald config set mdp.selfannounce.ticks_per_full_address 1
    executeOk_servald keyring add
    assert [ -e "$SERVALINSTANCE_PATH/serval.keyring" ]