[svn] commit: r2740 - in /trunk/src: bin/auth/tests/auth_srv_unittest.cc lib/python/isc/notify/tests/Makefile.am

[BIND 10 source code commits]

Author: jelte
Date: Mon Aug 16 11:23:05 2010
New Revision: 2740

Log:
fixed pythonpath for notify_out_test
internal cc message format for notifies seems to have changed, updated the tests that check that format

Modified:
    trunk/src/bin/auth/tests/auth_srv_unittest.cc
    trunk/src/lib/python/isc/notify/tests/Makefile.am

Modified: trunk/src/bin/auth/tests/auth_srv_unittest.cc
==============================================================================
--- trunk/src/bin/auth/tests/auth_srv_unittest.cc (original)
+++ trunk/src/bin/auth/tests/auth_srv_unittest.cc Mon Aug 16 11:23:05 2010
@@ -534,14 +534,15 @@
 
     // An internal command message should have been created and sent to an
     // external module.  Check them.
-    EXPECT_EQ("Xfrin", notify_session.msg_destination);
+    EXPECT_EQ("Zonemgr", notify_session.msg_destination);
     EXPECT_EQ("notify",
               notify_session.sent_msg->get("command")->get(0)->stringValue());
     ElementPtr notify_args = notify_session.sent_msg->get("command")->get(1);
     EXPECT_EQ("example.com.", notify_args->get("zone_name")->stringValue());
     EXPECT_EQ(DEFAULT_REMOTE_ADDRESS,
               notify_args->get("master")->stringValue());
-    EXPECT_EQ("IN", notify_args->get("rrclass")->stringValue());
+    cout << "[XX] ARGS: " << notify_args << endl;
+    EXPECT_EQ("IN", notify_args->get("zone_class")->stringValue());
 
     // On success, the server should return a response to the notify.
     headerCheck(parse_message, default_qid, Rcode::NOERROR(),
@@ -566,7 +567,7 @@
     // Other conditions should be the same, so simply confirm the RR class is
     // set correctly.
     ElementPtr notify_args = notify_session.sent_msg->get("command")->get(1);
-    EXPECT_EQ("CH", notify_args->get("rrclass")->stringValue());
+    EXPECT_EQ("CH", notify_args->get("zone_class")->stringValue());
 }
 
 TEST_F(AuthSrvTest, notifyEmptyQuestion) {

Modified: trunk/src/lib/python/isc/notify/tests/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/notify/tests/Makefile.am (original)
+++ trunk/src/lib/python/isc/notify/tests/Makefile.am Mon Aug 16 11:23:05 2010
@@ -7,6 +7,6 @@
 check-local:
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
-	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
+	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done