BIND 10 trac2165_2, updated. 156a94c86f1ba5e828ecc7365310d1977a2d15eb [2107] Remove effects that were used during EDNS testing

[BIND 10 source code commits]

The branch, trac2165_2 has been updated
       via  156a94c86f1ba5e828ecc7365310d1977a2d15eb (commit)
      from  1159e5bb601361ce0b4c9a8ed43aa92828b21744 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 156a94c86f1ba5e828ecc7365310d1977a2d15eb
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Aug 27 23:45:34 2012 +0530

    [2107] Remove effects that were used during EDNS testing

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dns/tests/message_unittest.cc      |    4 ----
 src/lib/dns/tests/testdata/message_toWire7 |   19 +------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/tests/message_unittest.cc b/src/lib/dns/tests/message_unittest.cc
index c20c95e..33e677f 100644
--- a/src/lib/dns/tests/message_unittest.cc
+++ b/src/lib/dns/tests/message_unittest.cc
@@ -771,10 +771,6 @@ TEST_F(MessageTest, toWireSigned) {
 }
 
 TEST_F(MessageTest, toWireSignedAndTruncated) {
-    // EDNSPtr edns(new EDNS());
-    // edns->setUDPSize(256);
-    // message_render.setEDNS(edns);
-
     message_render.setQid(0x75c1);
     message_render.setOpcode(Opcode::QUERY());
     message_render.setRcode(Rcode::NOERROR());
diff --git a/src/lib/dns/tests/testdata/message_toWire7 b/src/lib/dns/tests/testdata/message_toWire7
index 7165eeb..ba22634 100644
--- a/src/lib/dns/tests/testdata/message_toWire7
+++ b/src/lib/dns/tests/testdata/message_toWire7
@@ -2,7 +2,7 @@
 # A simple DNS query message (with a signed response)
 # ID = 0x75c1
 # QR=1 (response), Opcode=0, AA=1, RD=1 (other fields are 0)
-# QDCOUNT=1, ANCOUNT=2, ADCOUNT=1
+# QDCOUNT=1, ANCOUNT=1, ADCOUNT=0
 # Question: test.example.com. IN TXT
 # Answer:
 #  test.example.com. 3600 IN TXT aaaaa...
@@ -33,20 +33,3 @@ c0 0c
 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61
 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61
 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61
-
-# ----- used while developing, commented out here:
-
-# # signature
-# # same name
-# c0 0c
-# # RRSIG, IN, TTL=3600, RDLENGTH=0x28 TYPE_COV=A ALGO=5 (RSA/SHA-1) LABELS=3 ORIG_TTL=3600
-# 002e 0001 00000e10 0028 0010 05 03 00000e10
-# # SIG_EXPIRY=20000101000000 SIG_INCEP=20000201000000 KEY_ID=12345
-# 386d4380 38962200 3039
-# #(7) e  x  a  m  p  l  e (3) c  o  m  .
-#  07 65 78 61 6d 70 6c 65 03 63 6f 6d 00
-# # FAKEFAKEFAKE
-# 14 02 84 14 02 84 14 02 84
-
-# # NAME = <root> (0), TYPE=OPT(EDNS0), PAYLOAD=256
-# 00 0029 0100 00 00 0000 00 00