From 0254ca0ab8ed23b517265904292f8b42afa066f9 Mon Sep 17 00:00:00 2001
From: gardners <paul@servalproject.org>
Date: Thu, 21 Jun 2012 16:04:14 +0930
Subject: [PATCH] made dnaprotocol test more rigorous to ensure it really
 returns results from each SID/servald instance. Fixed bug in "keyring list"
 that was returning keyrings in lower case instead of normalised form using
 overlay_render_sid()

---
 commandline.c     | 11 ++++++-----
 tests/dnaprotocol | 10 ++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/commandline.c b/commandline.c
index 3a683ea6..a888c36c 100644
--- a/commandline.c
+++ b/commandline.c
@@ -1437,18 +1437,19 @@ int app_keyring_list(int argc, const char *const *argv, struct command_line_opti
       {
 	int kpn;
 	keypair *kp;
-	unsigned char *sid=NULL,*did=NULL;
+	unsigned char *sid=NULL,*did=NULL,*name=NULL;
 	for(kpn=0;kpn<k->contexts[cn]->identities[in]->keypair_count;kpn++)
 	  {
 	    kp=k->contexts[cn]->identities[in]->keypairs[kpn];
 	    if (kp->type==KEYTYPE_CRYPTOBOX) sid=kp->public_key;
-	    if (kp->type==KEYTYPE_DID) did=kp->private_key;
+	    if (kp->type==KEYTYPE_DID) { did=kp->private_key; name=kp->public_key; }
 	  }
-	if (sid||did) {
-	    int i;
-	    if (sid) for(i=0;i<SID_SIZE;i++) cli_printf("%02x",sid[i]);
+	if (sid||did) {	 
+	    if (sid) cli_printf("%s",overlay_render_sid(sid));
 	    cli_delim(":");
 	    if (did) cli_puts((char*)did);
+	    cli_delim(":");
+	    if (name) cli_puts((char*)name);
 	    cli_delim("\n");
 	}
       }
diff --git a/tests/dnaprotocol b/tests/dnaprotocol
index 8c7a4254..6708fa13 100755
--- a/tests/dnaprotocol
+++ b/tests/dnaprotocol
@@ -57,7 +57,9 @@ setup_servald_instances() {
    touch $DUMMYNET
    assert [ -e $DUMMYNET ]
    setup_servald_instance A $DUMMYNET
+   SIDA=$sid
    setup_servald_instance B $DUMMYNET
+   SIDB=$sid
 
    # Now make sure that they can see each other
    sleep 5 # Should be plenty of time
@@ -86,8 +88,8 @@ test_DNAWildcardSearchFindsSelf() {
    set_instance A
    executeOk_servald dna lookup "*"
    assertStdoutLineCount '==' 2
-   assertStdoutGrep --matches=1 "^sid://.*/5550001:5550001:Agent A Smith$"
-   assertStdoutGrep --matches=1 "^sid://.*/5550001:5550001:Agent B Smith$"
+   assertStdoutGrep --matches=1 "^sid://$SIDA/5550001:5550001:Agent A Smith$"
+   assertStdoutGrep --matches=1 "^sid://$SIDB/5550001:5550001:Agent B Smith$"
 }
 
 doc_DNAWildcardSearchFindsSelfEmpty="DNA lookup of wildcard (empty query method)"
@@ -99,8 +101,8 @@ test_DNAWildcardSearchFindsSelfEmpty() {
    set_instance A
    executeOk_servald dna lookup ""
    assertStdoutLineCount '==' 2 
-   assertStdoutGrep --matches=1 "^sid://.*/5550001:5550001:Agent A Smith$"
-   assertStdoutGrep --matches=1 "^sid://.*/5550001:5550001:Agent B Smith$"
+   assertStdoutGrep --matches=1 "^sid://$SIDA/5550001:5550001:Agent A Smith$"
+   assertStdoutGrep --matches=1 "^sid://$SIDB/5550001:5550001:Agent B Smith$"
 }