[svn] commit: r3047 - in /branches/trac354: ./ src/bin/auth/tests/ src/bin/auth/tests/testdata/ src/lib/dns/python/tests/ src/lib/dns/tests/ src/lib/dns/tests/testdata/
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Sep 28 06:02:50 UTC 2010
Author: jinmei
Date: Tue Sep 28 06:02:50 2010
New Revision: 3047
Log:
trac #354: dynamically generate wiredata when possible.
adjusted the generator script a bit for this purpose.
also fixed a distcheck failure in lib/dns/python tests.
Removed:
branches/trac354/src/bin/auth/tests/testdata/badExampleQuery_fromWire
branches/trac354/src/bin/auth/tests/testdata/examplequery_fromWire
branches/trac354/src/bin/auth/tests/testdata/iqueryresponse_fromWire
branches/trac354/src/bin/auth/tests/testdata/multiquestion_fromWire
branches/trac354/src/bin/auth/tests/testdata/queryBadEDNS_fromWire
branches/trac354/src/bin/auth/tests/testdata/shortanswer_fromWire
branches/trac354/src/bin/auth/tests/testdata/simplequery_fromWire
branches/trac354/src/bin/auth/tests/testdata/simpleresponse_fromWire
branches/trac354/src/lib/dns/tests/testdata/message_fromWire10
branches/trac354/src/lib/dns/tests/testdata/message_fromWire11
branches/trac354/src/lib/dns/tests/testdata/name_toWire5
branches/trac354/src/lib/dns/tests/testdata/name_toWire6
branches/trac354/src/lib/dns/tests/testdata/rdata_nsec_fromWire10
branches/trac354/src/lib/dns/tests/testdata/rdata_nsec_fromWire4
branches/trac354/src/lib/dns/tests/testdata/rdata_nsec_fromWire5
branches/trac354/src/lib/dns/tests/testdata/rdata_nsec_fromWire6
branches/trac354/src/lib/dns/tests/testdata/rdata_nsec_fromWire7
branches/trac354/src/lib/dns/tests/testdata/rdata_nsec_fromWire8
branches/trac354/src/lib/dns/tests/testdata/rdata_nsec_fromWire9
branches/trac354/src/lib/dns/tests/testdata/rdata_rrsig_fromWire2
branches/trac354/src/lib/dns/tests/testdata/rdata_soa_toWireUncompressed
branches/trac354/src/lib/dns/tests/testdata/rdata_txt_fromWire2
branches/trac354/src/lib/dns/tests/testdata/rdata_txt_fromWire3
branches/trac354/src/lib/dns/tests/testdata/rdata_txt_fromWire4
branches/trac354/src/lib/dns/tests/testdata/rdata_txt_fromWire5
Modified:
branches/trac354/configure.ac
branches/trac354/src/bin/auth/tests/Makefile.am
branches/trac354/src/bin/auth/tests/auth_srv_unittest.cc
branches/trac354/src/bin/auth/tests/run_unittests.cc
branches/trac354/src/lib/dns/python/tests/Makefile.am
branches/trac354/src/lib/dns/python/tests/message_python_test.py
branches/trac354/src/lib/dns/tests/Makefile.am
branches/trac354/src/lib/dns/tests/message_unittest.cc
branches/trac354/src/lib/dns/tests/messagerenderer_unittest.cc
branches/trac354/src/lib/dns/tests/rdata_nsec_unittest.cc
branches/trac354/src/lib/dns/tests/rdata_rrsig_unittest.cc
branches/trac354/src/lib/dns/tests/rdata_soa_unittest.cc
branches/trac354/src/lib/dns/tests/rdata_txt_unittest.cc
branches/trac354/src/lib/dns/tests/testdata/Makefile.am
branches/trac354/src/lib/dns/tests/testdata/gen-wiredata.py.in
Modified: branches/trac354/configure.ac
==============================================================================
--- branches/trac354/configure.ac (original)
+++ branches/trac354/configure.ac Tue Sep 28 06:02:50 2010
@@ -443,6 +443,7 @@
src/bin/msgq/tests/Makefile
src/bin/auth/Makefile
src/bin/auth/tests/Makefile
+ src/bin/auth/tests/testdata/Makefile
src/bin/auth/benchmarks/Makefile
src/bin/xfrin/Makefile
src/bin/xfrin/tests/Makefile
Modified: branches/trac354/src/bin/auth/tests/Makefile.am
==============================================================================
--- branches/trac354/src/bin/auth/tests/Makefile.am (original)
+++ branches/trac354/src/bin/auth/tests/Makefile.am Tue Sep 28 06:02:50 2010
@@ -1,7 +1,10 @@
+SUBDIRS = testdata .
+
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin
AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(srcdir)/testdata\"
+AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(top_builddir)/src/bin/auth/tests/testdata\"
AM_CXXFLAGS = $(B10_CXXFLAGS)
@@ -36,25 +39,3 @@
endif
noinst_PROGRAMS = $(TESTS)
-
-EXTRA_DIST = testdata/badExampleQuery_fromWire
-EXTRA_DIST += testdata/badExampleQuery_fromWire.spec
-EXTRA_DIST += testdata/example.com
-EXTRA_DIST += testdata/examplequery_fromWire
-EXTRA_DIST += testdata/examplequery_fromWire.spec
-EXTRA_DIST += testdata/example.sqlite3
-EXTRA_DIST += testdata/iqueryresponse_fromWire
-EXTRA_DIST += testdata/iqueryresponse_fromWire.spec
-EXTRA_DIST += testdata/multiquestion_fromWire
-EXTRA_DIST += testdata/multiquestion_fromWire.spec
-EXTRA_DIST += testdata/queryBadEDNS_fromWire
-EXTRA_DIST += testdata/queryBadEDNS_fromWire.spec
-EXTRA_DIST += testdata/shortanswer_fromWire
-EXTRA_DIST += testdata/shortanswer_fromWire.spec
-EXTRA_DIST += testdata/shortmessage_fromWire
-EXTRA_DIST += testdata/shortquestion_fromWire
-EXTRA_DIST += testdata/shortresponse_fromWire
-EXTRA_DIST += testdata/simplequery_fromWire
-EXTRA_DIST += testdata/simplequery_fromWire.spec
-EXTRA_DIST += testdata/simpleresponse_fromWire
-EXTRA_DIST += testdata/simpleresponse_fromWire.spec
Modified: branches/trac354/src/bin/auth/tests/auth_srv_unittest.cc
==============================================================================
--- branches/trac354/src/bin/auth/tests/auth_srv_unittest.cc (original)
+++ branches/trac354/src/bin/auth/tests/auth_srv_unittest.cc Tue Sep 28 06:02:50 2010
@@ -341,7 +341,7 @@
i == Opcode::NOTIFY().getCode()) {
continue;
}
- createDataFromFile("simplequery_fromWire");
+ createDataFromFile("simplequery_fromWire.wire");
data[2] = ((i << 3) & 0xff);
parse_message.clear(Message::PARSE);
@@ -363,7 +363,7 @@
// Multiple questions. Should result in FORMERR.
TEST_F(AuthSrvTest, multiQuestion) {
- createDataFromFile("multiquestion_fromWire");
+ createDataFromFile("multiquestion_fromWire.wire");
EXPECT_EQ(true, server.processMessage(*io_message, parse_message,
response_renderer));
headerCheck(parse_message, default_qid, Rcode::FORMERR(), opcode.getCode(),
@@ -393,7 +393,7 @@
// or malformed or could otherwise cause a protocol error.
TEST_F(AuthSrvTest, response) {
// A valid (although unusual) response
- createDataFromFile("simpleresponse_fromWire");
+ createDataFromFile("simpleresponse_fromWire.wire");
EXPECT_EQ(false, server.processMessage(*io_message, parse_message,
response_renderer));
@@ -404,7 +404,7 @@
response_renderer));
// A response to iquery. must be dropped rather than returning NOTIMP.
- createDataFromFile("iqueryresponse_fromWire");
+ createDataFromFile("iqueryresponse_fromWire.wire");
EXPECT_EQ(false, server.processMessage(*io_message, parse_message,
response_renderer));
}
@@ -422,7 +422,7 @@
// Query with a broken answer section
TEST_F(AuthSrvTest, shortAnswer) {
- createDataFromFile("shortanswer_fromWire");
+ createDataFromFile("shortanswer_fromWire.wire");
EXPECT_EQ(true, server.processMessage(*io_message, parse_message,
response_renderer));
@@ -441,7 +441,7 @@
// Query with unsupported version of EDNS.
TEST_F(AuthSrvTest, ednsBadVers) {
- createDataFromFile("queryBadEDNS_fromWire");
+ createDataFromFile("queryBadEDNS_fromWire.wire");
EXPECT_EQ(true, server.processMessage(*io_message, parse_message,
response_renderer));
@@ -722,7 +722,7 @@
// query for existent data in the installed data source. The resulting
// response should have the AA flag on, and have an RR in each answer
// and authority section.
- createDataFromFile("examplequery_fromWire");
+ createDataFromFile("examplequery_fromWire.wire");
EXPECT_EQ(true, server.processMessage(*io_message, parse_message,
response_renderer));
headerCheck(parse_message, default_qid, Rcode::NOERROR(), opcode.getCode(),
@@ -736,7 +736,7 @@
// tool and the data source itself naively accept it). This will result
// in a SERVFAIL response, and the answer and authority sections should
// be empty.
- createDataFromFile("badExampleQuery_fromWire");
+ createDataFromFile("badExampleQuery_fromWire.wire");
EXPECT_EQ(true, server.processMessage(*io_message, parse_message,
response_renderer));
headerCheck(parse_message, default_qid, Rcode::SERVFAIL(),
@@ -751,7 +751,7 @@
updateConfig(&server, BADCONFIG_TESTDB, false);
// The original data source should still exist.
- createDataFromFile("examplequery_fromWire");
+ createDataFromFile("examplequery_fromWire.wire");
EXPECT_EQ(true, server.processMessage(*io_message, parse_message,
response_renderer));
headerCheck(parse_message, default_qid, Rcode::NOERROR(), opcode.getCode(),
Modified: branches/trac354/src/bin/auth/tests/run_unittests.cc
==============================================================================
--- branches/trac354/src/bin/auth/tests/run_unittests.cc (original)
+++ branches/trac354/src/bin/auth/tests/run_unittests.cc Tue Sep 28 06:02:50 2010
@@ -23,6 +23,7 @@
{
::testing::InitGoogleTest(&argc, argv);
isc::UnitTestUtil::addDataPath(TEST_DATA_DIR);
+ isc::UnitTestUtil::addDataPath(TEST_DATA_BUILDDIR);
return (RUN_ALL_TESTS());
}
Modified: branches/trac354/src/lib/dns/python/tests/Makefile.am
==============================================================================
--- branches/trac354/src/lib/dns/python/tests/Makefile.am (original)
+++ branches/trac354/src/lib/dns/python/tests/Makefile.am Tue Sep 28 06:02:50 2010
@@ -10,6 +10,7 @@
PYTESTS += rrtype_python_test.py
EXTRA_DIST = $(PYTESTS)
+EXTRA_DIST += testutil.py
# If necessary (rare cases), explicitly specify paths to dynamic libraries
# required by loadable python modules.
Modified: branches/trac354/src/lib/dns/python/tests/message_python_test.py
==============================================================================
--- branches/trac354/src/lib/dns/python/tests/message_python_test.py (original)
+++ branches/trac354/src/lib/dns/python/tests/message_python_test.py Tue Sep 28 06:02:50 2010
@@ -335,7 +335,7 @@
self.assertEqual(None, self.p.get_edns())
message_parse = Message(Message.PARSE)
- factoryFromFile(message_parse, "message_fromWire10")
+ factoryFromFile(message_parse, "message_fromWire10.wire")
edns = message_parse.get_edns()
self.assertEqual(0, edns.get_version())
self.assertEqual(4096, edns.get_udp_size())
@@ -473,12 +473,12 @@
def test_EDNS0ExtCode(self):
# Extended Rcode = BADVERS
message_parse = Message(Message.PARSE)
- factoryFromFile(message_parse, "message_fromWire10")
+ factoryFromFile(message_parse, "message_fromWire10.wire")
self.assertEqual(Rcode.BADVERS(), message_parse.get_rcode())
# Maximum extended Rcode
message_parse.clear(Message.PARSE)
- factoryFromFile(message_parse, "message_fromWire11")
+ factoryFromFile(message_parse, "message_fromWire11.wire")
self.assertEqual(0xfff, message_parse.get_rcode().get_code())
def test_BadEDNS0(self):
Modified: branches/trac354/src/lib/dns/tests/Makefile.am
==============================================================================
--- branches/trac354/src/lib/dns/tests/Makefile.am (original)
+++ branches/trac354/src/lib/dns/tests/Makefile.am Tue Sep 28 06:02:50 2010
@@ -53,101 +53,3 @@
endif
noinst_PROGRAMS = $(TESTS)
-
-# NOTE: keep this in sync with real file listing
-# so is included in tarball
-EXTRA_DIST = testdata/gen-wiredata.py.in
-EXTRA_DIST += testdata/edns_toWire1.spec testdata/edns_toWire2.spec
-EXTRA_DIST += testdata/edns_toWire3.spec testdata/edns_toWire4.spec
-EXTRA_DIST += testdata/message_fromWire1
-EXTRA_DIST += testdata/message_fromWire10
-EXTRA_DIST += testdata/message_fromWire10.spec
-EXTRA_DIST += testdata/message_fromWire11
-EXTRA_DIST += testdata/message_fromWire11.spec
-EXTRA_DIST += testdata/message_fromWire2
-EXTRA_DIST += testdata/message_fromWire3
-EXTRA_DIST += testdata/message_fromWire4
-EXTRA_DIST += testdata/message_fromWire5
-EXTRA_DIST += testdata/message_fromWire6
-EXTRA_DIST += testdata/message_fromWire7
-EXTRA_DIST += testdata/message_fromWire8
-EXTRA_DIST += testdata/message_fromWire9
-EXTRA_DIST += testdata/message_toWire1
-EXTRA_DIST += testdata/name_fromWire1
-EXTRA_DIST += testdata/name_fromWire10
-EXTRA_DIST += testdata/name_fromWire11
-EXTRA_DIST += testdata/name_fromWire12
-EXTRA_DIST += testdata/name_fromWire13
-EXTRA_DIST += testdata/name_fromWire14
-EXTRA_DIST += testdata/name_fromWire2
-EXTRA_DIST += testdata/name_fromWire3_1
-EXTRA_DIST += testdata/name_fromWire3_2
-EXTRA_DIST += testdata/name_fromWire4
-EXTRA_DIST += testdata/name_fromWire6
-EXTRA_DIST += testdata/name_fromWire7
-EXTRA_DIST += testdata/name_fromWire8
-EXTRA_DIST += testdata/name_fromWire9
-EXTRA_DIST += testdata/name_toWire1
-EXTRA_DIST += testdata/name_toWire2
-EXTRA_DIST += testdata/name_toWire3
-EXTRA_DIST += testdata/name_toWire4
-EXTRA_DIST += testdata/name_toWire5
-EXTRA_DIST += testdata/name_toWire5.spec
-EXTRA_DIST += testdata/name_toWire6
-EXTRA_DIST += testdata/name_toWire6.spec
-EXTRA_DIST += testdata/question_fromWire
-EXTRA_DIST += testdata/question_toWire1
-EXTRA_DIST += testdata/question_toWire2
-EXTRA_DIST += testdata/rdata_cname_fromWire
-EXTRA_DIST += testdata/rdata_dname_fromWire
-EXTRA_DIST += testdata/rdata_dnskey_fromWire
-EXTRA_DIST += testdata/rdata_ds_fromWire
-EXTRA_DIST += testdata/rdata_in_a_fromWire
-EXTRA_DIST += testdata/rdata_in_aaaa_fromWire
-EXTRA_DIST += testdata/rdata_mx_fromWire
-EXTRA_DIST += testdata/rdata_mx_toWire1
-EXTRA_DIST += testdata/rdata_ns_fromWire
-EXTRA_DIST += testdata/rdata_nsec3_fromWire1
-EXTRA_DIST += testdata/rdata_nsec3_fromWire2
-EXTRA_DIST += testdata/rdata_nsec3_fromWire3
-EXTRA_DIST += testdata/rdata_nsec3param_fromWire1
-EXTRA_DIST += testdata/rdata_nsec_fromWire1
-EXTRA_DIST += testdata/rdata_nsec_fromWire10
-EXTRA_DIST += testdata/rdata_nsec_fromWire10.spec
-EXTRA_DIST += testdata/rdata_nsec_fromWire2
-EXTRA_DIST += testdata/rdata_nsec_fromWire3
-EXTRA_DIST += testdata/rdata_nsec_fromWire4
-EXTRA_DIST += testdata/rdata_nsec_fromWire4.spec
-EXTRA_DIST += testdata/rdata_nsec_fromWire5
-EXTRA_DIST += testdata/rdata_nsec_fromWire5.spec
-EXTRA_DIST += testdata/rdata_nsec_fromWire6
-EXTRA_DIST += testdata/rdata_nsec_fromWire6.spec
-EXTRA_DIST += testdata/rdata_nsec_fromWire7
-EXTRA_DIST += testdata/rdata_nsec_fromWire7.spec
-EXTRA_DIST += testdata/rdata_nsec_fromWire8
-EXTRA_DIST += testdata/rdata_nsec_fromWire8.spec
-EXTRA_DIST += testdata/rdata_nsec_fromWire9
-EXTRA_DIST += testdata/rdata_nsec_fromWire9.spec
-EXTRA_DIST += testdata/rdata_opt_fromWire
-EXTRA_DIST += testdata/rdata_rrsig_fromWire1
-EXTRA_DIST += testdata/rdata_rrsig_fromWire2
-EXTRA_DIST += testdata/rdata_rrsig_fromWire2.spec
-EXTRA_DIST += testdata/rdata_soa_fromWire
-EXTRA_DIST += testdata/rdata_soa_toWireUncompressed
-EXTRA_DIST += testdata/rdata_soa_toWireUncompressed.spec
-EXTRA_DIST += testdata/rdata_txt_fromWire1
-EXTRA_DIST += testdata/rdata_txt_fromWire2
-EXTRA_DIST += testdata/rdata_txt_fromWire2.spec
-EXTRA_DIST += testdata/rdata_txt_fromWire3
-EXTRA_DIST += testdata/rdata_txt_fromWire3.spec
-EXTRA_DIST += testdata/rdata_txt_fromWire4
-EXTRA_DIST += testdata/rdata_txt_fromWire4.spec
-EXTRA_DIST += testdata/rdata_txt_fromWire5
-EXTRA_DIST += testdata/rdata_txt_fromWire5.spec
-EXTRA_DIST += testdata/rdata_unknown_fromWire
-EXTRA_DIST += testdata/rrcode16_fromWire1
-EXTRA_DIST += testdata/rrcode16_fromWire2
-EXTRA_DIST += testdata/rrcode32_fromWire1
-EXTRA_DIST += testdata/rrcode32_fromWire2
-EXTRA_DIST += testdata/rrset_toWire1
-EXTRA_DIST += testdata/rrset_toWire2
Modified: branches/trac354/src/lib/dns/tests/message_unittest.cc
==============================================================================
--- branches/trac354/src/lib/dns/tests/message_unittest.cc (original)
+++ branches/trac354/src/lib/dns/tests/message_unittest.cc Tue Sep 28 06:02:50 2010
@@ -97,7 +97,7 @@
TEST_F(MessageTest, getEDNS) {
EXPECT_FALSE(message_parse.getEDNS()); // by default EDNS isn't set
- factoryFromFile(message_parse, "message_fromWire10");
+ factoryFromFile(message_parse, "message_fromWire10.wire");
EXPECT_TRUE(message_parse.getEDNS());
EXPECT_EQ(0, message_parse.getEDNS()->getVersion());
EXPECT_EQ(4096, message_parse.getEDNS()->getUDPSize());
@@ -149,12 +149,12 @@
TEST_F(MessageTest, EDNS0ExtRcode) {
// Extended Rcode = BADVERS
- factoryFromFile(message_parse, "message_fromWire10");
+ factoryFromFile(message_parse, "message_fromWire10.wire");
EXPECT_EQ(Rcode::BADVERS(), message_parse.getRcode());
// Maximum extended Rcode
message_parse.clear(Message::PARSE);
- factoryFromFile(message_parse, "message_fromWire11");
+ factoryFromFile(message_parse, "message_fromWire11.wire");
EXPECT_EQ(0xfff, message_parse.getRcode().getCode());
}
Modified: branches/trac354/src/lib/dns/tests/messagerenderer_unittest.cc
==============================================================================
--- branches/trac354/src/lib/dns/tests/messagerenderer_unittest.cc (original)
+++ branches/trac354/src/lib/dns/tests/messagerenderer_unittest.cc Tue Sep 28 06:02:50 2010
@@ -130,7 +130,7 @@
// name compression in case sensitive manner. See the data file
// description for details.
renderer.setCompressMode(MessageRenderer::CASE_SENSITIVE);
- UnitTestUtil::readWireData("name_toWire5", data);
+ UnitTestUtil::readWireData("name_toWire5.wire", data);
renderer.writeName(Name("a.example.com."));
renderer.writeName(Name("b.eXample.com."));
renderer.writeName(Name("c.eXample.com."));
@@ -140,7 +140,7 @@
TEST_F(MessageRendererTest, writeNameMixedCaseCompress) {
renderer.setCompressMode(MessageRenderer::CASE_SENSITIVE);
- UnitTestUtil::readWireData("name_toWire6", data);
+ UnitTestUtil::readWireData("name_toWire6.wire", data);
renderer.writeName(Name("a.example.com."));
renderer.writeName(Name("b.eXample.com."));
Modified: branches/trac354/src/lib/dns/tests/rdata_nsec_unittest.cc
==============================================================================
--- branches/trac354/src/lib/dns/tests/rdata_nsec_unittest.cc (original)
+++ branches/trac354/src/lib/dns/tests/rdata_nsec_unittest.cc Tue Sep 28 06:02:50 2010
@@ -70,39 +70,39 @@
// A malformed NSEC bitmap length field that could cause overflow.
EXPECT_THROW(rdataFactoryFromFile(RRType::NSEC(), RRClass::IN(),
- "rdata_nsec_fromWire4"),
+ "rdata_nsec_fromWire4.wire"),
DNSMessageFORMERR);
// The bitmap field is incomplete (only the first byte is included)
EXPECT_THROW(rdataFactoryFromFile(RRType::NSEC(), RRClass::IN(),
- "rdata_nsec_fromWire5"),
+ "rdata_nsec_fromWire5.wire"),
DNSMessageFORMERR);
// Bitmap length is 0, which is invalid.
EXPECT_THROW(rdataFactoryFromFile(RRType::NSEC(), RRClass::IN(),
- "rdata_nsec_fromWire6"),
+ "rdata_nsec_fromWire6.wire"),
DNSMessageFORMERR);
// A boundary case: longest possible bitmaps (32 maps). This should be
// accepted.
EXPECT_NO_THROW(rdataFactoryFromFile(RRType::NSEC(), RRClass::IN(),
- "rdata_nsec_fromWire7"));
+ "rdata_nsec_fromWire7.wire"));
// Another boundary condition: 33 bitmaps, which should be rejected.
EXPECT_THROW(rdataFactoryFromFile(RRType::NSEC(), RRClass::IN(),
- "rdata_nsec_fromWire8"),
+ "rdata_nsec_fromWire8.wire"),
DNSMessageFORMERR);
// Disordered bitmap window blocks.
EXPECT_THROW(rdataFactoryFromFile(RRType::NSEC(), RRClass::IN(),
- "rdata_nsec_fromWire9"),
+ "rdata_nsec_fromWire9.wire"),
DNSMessageFORMERR);
// Bitmap ending with all-zero bytes. Not necessarily harmful except
// the additional overhead of parsing, but invalid according to the
// spec anyway.
EXPECT_THROW(rdataFactoryFromFile(RRType::NSEC(), RRClass::IN(),
- "rdata_nsec_fromWire10"),
+ "rdata_nsec_fromWire10.wire"),
DNSMessageFORMERR);
}
Modified: branches/trac354/src/lib/dns/tests/rdata_rrsig_unittest.cc
==============================================================================
--- branches/trac354/src/lib/dns/tests/rdata_rrsig_unittest.cc (original)
+++ branches/trac354/src/lib/dns/tests/rdata_rrsig_unittest.cc Tue Sep 28 06:02:50 2010
@@ -131,7 +131,7 @@
// RDLEN is too short
EXPECT_THROW(rdataFactoryFromFile(RRType::RRSIG(), RRClass::IN(),
- "rdata_rrsig_fromWire2"),
+ "rdata_rrsig_fromWire2.wire"),
InvalidRdataLength);
}
}
Modified: branches/trac354/src/lib/dns/tests/rdata_soa_unittest.cc
==============================================================================
--- branches/trac354/src/lib/dns/tests/rdata_soa_unittest.cc (original)
+++ branches/trac354/src/lib/dns/tests/rdata_soa_unittest.cc Tue Sep 28 06:02:50 2010
@@ -65,7 +65,7 @@
obuffer.skip(2);
rdata_soa.toWire(obuffer);
vector<unsigned char> data;
- UnitTestUtil::readWireData("rdata_soa_toWireUncompressed", data);
+ UnitTestUtil::readWireData("rdata_soa_toWireUncompressed.wire", data);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
static_cast<const uint8_t *>(obuffer.getData()) + 2,
obuffer.getLength() - 2, &data[2], data.size() - 2);
Modified: branches/trac354/src/lib/dns/tests/rdata_txt_unittest.cc
==============================================================================
--- branches/trac354/src/lib/dns/tests/rdata_txt_unittest.cc (original)
+++ branches/trac354/src/lib/dns/tests/rdata_txt_unittest.cc Tue Sep 28 06:02:50 2010
@@ -109,12 +109,12 @@
// Empty character string
EXPECT_EQ(0, rdata_txt_empty.compare(
*rdataFactoryFromFile(RRType("TXT"), RRClass("IN"),
- "rdata_txt_fromWire2")));
+ "rdata_txt_fromWire2.wire")));
// Multiple character strings
obuffer.clear();
rdataFactoryFromFile(RRType("TXT"), RRClass("IN"),
- "rdata_txt_fromWire3")->toWire(obuffer);
+ "rdata_txt_fromWire3.wire")->toWire(obuffer);
// the result should be 'wiredata_txt' repeated twice
vector<uint8_t> expected_data(wiredata_txt, wiredata_txt +
sizeof(wiredata_txt));
@@ -145,12 +145,12 @@
// RDATA is empty, which is invalid for TXT.
EXPECT_THROW(rdataFactoryFromFile(RRType("TXT"), RRClass("IN"),
- "rdata_txt_fromWire4"),
+ "rdata_txt_fromWire4.wire"),
DNSMessageFORMERR);
// character-string length is too large, which could cause overrun.
EXPECT_THROW(rdataFactoryFromFile(RRType("TXT"), RRClass("IN"),
- "rdata_txt_fromWire5"),
+ "rdata_txt_fromWire5.wire"),
DNSMessageFORMERR);
}
Modified: branches/trac354/src/lib/dns/tests/testdata/Makefile.am
==============================================================================
--- branches/trac354/src/lib/dns/tests/testdata/Makefile.am (original)
+++ branches/trac354/src/lib/dns/tests/testdata/Makefile.am Tue Sep 28 06:02:50 2010
@@ -2,6 +2,55 @@
BUILT_SOURCES = edns_toWire1.wire edns_toWire2.wire edns_toWire3.wire
BUILT_SOURCES += edns_toWire4.wire
+BUILT_SOURCES += message_fromWire10.wire message_fromWire11.wire
+BUILT_SOURCES += name_toWire5.wire name_toWire6.wire
+BUILT_SOURCES += rdata_nsec_fromWire4.wire rdata_nsec_fromWire5.wire
+BUILT_SOURCES += rdata_nsec_fromWire6.wire rdata_nsec_fromWire7.wire
+BUILT_SOURCES += rdata_nsec_fromWire8.wire rdata_nsec_fromWire9.wire
+BUILT_SOURCES += rdata_nsec_fromWire10.wire
+BUILT_SOURCES += rdata_rrsig_fromWire2.wire
+BUILT_SOURCES += rdata_soa_toWireUncompressed.wire
+BUILT_SOURCES += rdata_txt_fromWire2.wire rdata_txt_fromWire3.wire
+BUILT_SOURCES += rdata_txt_fromWire4.wire rdata_txt_fromWire5.wire
+
+# NOTE: keep this in sync with real file listing
+# so is included in tarball
+EXTRA_DIST = gen-wiredata.py.in
+EXTRA_DIST += edns_toWire1.spec edns_toWire2.spec
+EXTRA_DIST += edns_toWire3.spec edns_toWire4.spec
+EXTRA_DIST += message_fromWire1 message_fromWire2
+EXTRA_DIST += message_fromWire3 message_fromWire4
+EXTRA_DIST += message_fromWire5 message_fromWire6
+EXTRA_DIST += message_fromWire7 message_fromWire8
+EXTRA_DIST += message_fromWire9 message_fromWire10.spec
+EXTRA_DIST += message_fromWire11.spec
+EXTRA_DIST += message_toWire1
+EXTRA_DIST += name_fromWire1 name_fromWire2 name_fromWire3_1 name_fromWire3_2
+EXTRA_DIST += name_fromWire4 name_fromWire6 name_fromWire7 name_fromWire8
+EXTRA_DIST += name_fromWire9 name_fromWire10 name_fromWire11 name_fromWire12
+EXTRA_DIST += name_fromWire13 name_fromWire14
+EXTRA_DIST += name_toWire1 name_toWire2 name_toWire3 name_toWire4
+EXTRA_DIST += name_toWire5.spec name_toWire6.spec
+EXTRA_DIST += question_fromWire question_toWire1 question_toWire2
+EXTRA_DIST += rdata_cname_fromWire rdata_dname_fromWire rdata_dnskey_fromWire
+EXTRA_DIST += rdata_ds_fromWire rdata_in_a_fromWire rdata_in_aaaa_fromWire
+EXTRA_DIST += rdata_mx_fromWire rdata_mx_toWire1 rdata_ns_fromWire
+EXTRA_DIST += rdata_nsec3_fromWire1 rdata_nsec3_fromWire2 rdata_nsec3_fromWire3
+EXTRA_DIST += rdata_nsec3param_fromWire1 rdata_nsec_fromWire1
+EXTRA_DIST += rdata_nsec_fromWire2 rdata_nsec_fromWire3
+EXTRA_DIST += rdata_nsec_fromWire4.spec rdata_nsec_fromWire5.spec
+EXTRA_DIST += rdata_nsec_fromWire6.spec rdata_nsec_fromWire7.spec
+EXTRA_DIST += rdata_nsec_fromWire8.spec rdata_nsec_fromWire9.spec
+EXTRA_DIST += rdata_nsec_fromWire10.spec
+EXTRA_DIST += rdata_opt_fromWire rdata_rrsig_fromWire1
+EXTRA_DIST += rdata_rrsig_fromWire2.spec
+EXTRA_DIST += rdata_soa_fromWire rdata_soa_toWireUncompressed.spec
+EXTRA_DIST += rdata_txt_fromWire1 rdata_txt_fromWire2.spec
+EXTRA_DIST += rdata_txt_fromWire3.spec rdata_txt_fromWire4.spec
+EXTRA_DIST += rdata_txt_fromWire5.spec rdata_unknown_fromWire
+EXTRA_DIST += rrcode16_fromWire1 rrcode16_fromWire2
+EXTRA_DIST += rrcode32_fromWire1 rrcode32_fromWire2
+EXTRA_DIST += rrset_toWire1 rrset_toWire2
.spec.wire:
./gen-wiredata.py -o $@ $<
Modified: branches/trac354/src/lib/dns/tests/testdata/gen-wiredata.py.in
==============================================================================
--- branches/trac354/src/lib/dns/tests/testdata/gen-wiredata.py.in (original)
+++ branches/trac354/src/lib/dns/tests/testdata/gen-wiredata.py.in Tue Sep 28 06:02:50 2010
@@ -19,9 +19,9 @@
from datetime import datetime
from optparse import OptionParser
-re_hex = re.compile('0x[0-9a-fA-F]+')
-re_decimal = re.compile('\d+$')
-re_string = re.compile("\'(.*)\'$")
+re_hex = re.compile(r'0x[0-9a-fA-F]+')
+re_decimal = re.compile(r'\d+$')
+re_string = re.compile(r"\'(.*)\'$")
dnssec_timefmt = '%Y%m%d%H%M%S'
@@ -365,9 +365,6 @@
parser.add_option('-o', '--output', action='store', dest='output',
default=None, metavar='FILE',
help='output file name [default: prefix of input_file]')
- parser.add_option('-m', '--mode', action='store', dest='mode',
- default='message', metavar='[message|custom]',
- help='specify dump mode [default: %default]')
(options, args) = parser.parse_args()
if len(args) == 0:
@@ -389,9 +386,10 @@
print_header(output, configfile)
- if options.mode == 'custom':
+ # First try the 'custom' mode; if it fails assume the standard mode.
+ try:
sections = config.get('custom', 'sections').split(':')
- else:
+ except configparser.NoSectionError:
sections = ['header', 'question', 'edns']
for s in sections:
More information about the bind10-changes
mailing list