From 8cdae125e7c7ef5f1acd47450751fca9a80869d8 Mon Sep 17 00:00:00 2001 From: Andrew Bettison Date: Thu, 5 Jul 2012 14:57:28 +0930 Subject: [PATCH] Fix 'dnaprotocol' tests broken by earlier refactor --- tests/dnaprotocol | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/dnaprotocol b/tests/dnaprotocol index 71defbba..5202f80a 100755 --- a/tests/dnaprotocol +++ b/tests/dnaprotocol @@ -61,7 +61,7 @@ test_LookupWildcard() { executeOk_servald dna lookup "*" assertStdoutLineCount '==' 2 assertStdoutGrep --matches=1 "^sid://$SIDA/5550001:5550001:Agent A Smith$" - assertStdoutGrep --matches=1 "^sid://$SIDB/5550001:5550001:Agent B Smith$" + assertStdoutGrep --matches=1 "^sid://$SIDB/5550002:5550002:Agent B Smith$" } doc_LookupEmpty="Lookup by empty string" @@ -69,23 +69,23 @@ test_LookupEmpty() { executeOk_servald dna lookup "" assertStdoutLineCount '==' 2 assertStdoutGrep --matches=1 "^sid://$SIDA/5550001:5550001:Agent A Smith$" - assertStdoutGrep --matches=1 "^sid://$SIDB/5550001:5550001:Agent B Smith$" + assertStdoutGrep --matches=1 "^sid://$SIDB/5550002:5550002:Agent B Smith$" } doc_LookupNumber="Lookup by phone number" test_LookupNumber() { - # Make sure we get no false positives executeOk_servald dna lookup "5551234" assertStdoutLineCount '==' 0 executeOk_servald dna lookup "555000" assertStdoutLineCount '==' 0 executeOk_servald dna lookup "55500011" assertStdoutLineCount '==' 0 - # Make sure we get the right results, and no duplicates executeOk_servald dna lookup "5550001" - assertStdoutLineCount '==' 2 + assertStdoutLineCount '==' 1 assertStdoutGrep --matches=1 "^sid://$SIDA/5550001:5550001:Agent A Smith$" - assertStdoutGrep --matches=1 "^sid://$SIDB/5550001:5550001:Agent B Smith$" + executeOk_servald dna lookup "5550002" + assertStdoutLineCount '==' 1 + assertStdoutGrep --matches=1 "^sid://$SIDB/5550002:5550002:Agent B Smith$" } doc_NodeinfoLocal="Node info auto-resolves for local identities"