[svn] commit: r2798 - in /branches/trac316: ./ src/bin/auth/ src/bin/bind10/ src/bin/xfrin/ src/bin/xfrin/tests/ src/bin/xfrout/tests/ src/lib/bench/ src/lib/cc/ src/lib/cc/tests/ src/lib/config/ src/lib/config/testdata/ src/lib/datasrc/ src/lib/dns/ src/lib/dns/python/ src/lib/dns/python/tests/ src/lib/dns/rdata/generic/ src/lib/dns/tests/ src/lib/exceptions/tests/ src/lib/python/isc/config/tests/ src/lib/python/isc/log/tests/ src/lib/python/isc/notify/ src/lib/python/isc/notify/tests/
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Aug 25 12:40:17 UTC 2010
Author: jreed
Date: Wed Aug 25 12:40:17 2010
New Revision: 2798
Log:
Merged in from trunk to catch up.
Added:
branches/trac316/src/lib/config/testdata/Makefile.am
- copied unchanged from r2797, trunk/src/lib/config/testdata/Makefile.am
branches/trac316/src/lib/config/testdata/b10-config.db.master
- copied unchanged from r2797, trunk/src/lib/config/testdata/b10-config.db.master
Removed:
branches/trac316/src/lib/config/testdata/b10-config.db
Modified:
branches/trac316/ (props changed)
branches/trac316/ChangeLog
branches/trac316/configure.ac
branches/trac316/src/bin/auth/asio_link.h
branches/trac316/src/bin/bind10/bind10.py.in
branches/trac316/src/bin/bind10/run_bind10.sh.in
branches/trac316/src/bin/xfrin/ (props changed)
branches/trac316/src/bin/xfrin/tests/Makefile.am
branches/trac316/src/bin/xfrin/tests/xfrin_test.py
branches/trac316/src/bin/xfrout/tests/Makefile.am
branches/trac316/src/lib/bench/ (props changed)
branches/trac316/src/lib/cc/ (props changed)
branches/trac316/src/lib/cc/tests/ (props changed)
branches/trac316/src/lib/config/Makefile.am
branches/trac316/src/lib/config/documentation.txt
branches/trac316/src/lib/datasrc/ (props changed)
branches/trac316/src/lib/dns/ (props changed)
branches/trac316/src/lib/dns/messagerenderer.h
branches/trac316/src/lib/dns/python/Makefile.am
branches/trac316/src/lib/dns/python/rrclass_python.cc
branches/trac316/src/lib/dns/python/rrtype_python.cc
branches/trac316/src/lib/dns/python/tests/Makefile.am
branches/trac316/src/lib/dns/rdata/generic/rrsig_46.cc (props changed)
branches/trac316/src/lib/dns/tests/ (props changed)
branches/trac316/src/lib/exceptions/tests/ (props changed)
branches/trac316/src/lib/python/isc/config/tests/Makefile.am
branches/trac316/src/lib/python/isc/config/tests/cfgmgr_test.py
branches/trac316/src/lib/python/isc/config/tests/unittest_fakesession.py (contents, props changed)
branches/trac316/src/lib/python/isc/log/tests/log_test.py
branches/trac316/src/lib/python/isc/notify/notify_out.py
branches/trac316/src/lib/python/isc/notify/tests/Makefile.am
Modified: branches/trac316/ChangeLog
==============================================================================
--- branches/trac316/ChangeLog (original)
+++ branches/trac316/ChangeLog Wed Aug 25 12:40:17 2010
@@ -1,3 +1,14 @@
+ 90. [build] jinmei
+ (Darwin/Mac OS X specific) Specify DYLD_LIBRARY_PATH for tests and
+ experimental run under the source tree. Without this loadable
+ python modules refer to installation paths, which may confuse the
+ operation due to version mismatch or even trigger run time errors
+ due to missing libraries. (Trac #313, r2782)
+
+ 89. [build] jinmei
+ Generate b10-config.db for tests at build time so that the source
+ tree does not have to be writable. (Trac #315, r2776)
+
88. [func] jelte
Blocking reads on the msgq command channel now have a timeout
(defaults to 4 seconds, modifiable as needed by modules).
Modified: branches/trac316/configure.ac
==============================================================================
--- branches/trac316/configure.ac (original)
+++ branches/trac316/configure.ac Wed Aug 25 12:40:17 2010
@@ -40,14 +40,30 @@
[enable_static_link=yes], [enable_static_link=no])
AM_CONDITIONAL(USE_STATIC_LINK, test $enable_static_link = yes)
-# OS dependent compiler flags
+# OS dependent configuration
+SET_ENV_LIBRARY_PATH=no
+ENV_LIBRARY_PATH=LD_LIBRARY_PATH
+
case "$host" in
*-solaris*)
# Solaris requires special definitions to get some standard libraries
# (e.g. getopt(3)) available with common used header files.
CPPFLAGS="$CPPFLAGS -D_XPG4_2 -D__EXTENSIONS__"
;;
+*-apple-darwin*)
+ # libtool doesn't work pefectly with Darwin: libtool embeds the
+ # final install path in dynamic libraries and our loadable python
+ # modules always refer to that path even if it's loaded within the
+ # source tree. This prevents pre-install tests from working.
+ # To work around this problem we explicitly specify paths to dynamic
+ # libraries when we use them in the source tree.
+ SET_ENV_LIBRARY_PATH=yes
+ ENV_LIBRARY_PATH=DYLD_LIBRARY_PATH
+ ;;
esac
+AM_CONDITIONAL(SET_ENV_LIBRARY_PATH, test $SET_ENV_LIBRARY_PATH = yes)
+AC_SUBST(SET_ENV_LIBRARY_PATH)
+AC_SUBST(ENV_LIBRARY_PATH)
m4_define([_AM_PYTHON_INTERPRETER_LIST], [python python3 python3.1])
AC_ARG_WITH([pythonpath],
@@ -433,6 +449,7 @@
src/lib/python/isc/notify/tests/Makefile
src/lib/config/Makefile
src/lib/config/tests/Makefile
+ src/lib/config/testdata/Makefile
src/lib/dns/Makefile
src/lib/dns/tests/Makefile
src/lib/dns/python/Makefile
Modified: branches/trac316/src/bin/auth/asio_link.h
==============================================================================
--- branches/trac316/src/bin/auth/asio_link.h (original)
+++ branches/trac316/src/bin/auth/asio_link.h Wed Aug 25 12:40:17 2010
@@ -207,7 +207,7 @@
/// will be thrown.
///
/// Memory for the created object will be dynamically allocated. It's
- /// caller's responsibility to \c delete it later.
+ /// the caller's responsibility to \c delete it later.
/// If resource allocation for the new object fails, a corresponding
/// standard exception will be thrown.
///
Modified: branches/trac316/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac316/src/bin/bind10/bind10.py.in (original)
+++ branches/trac316/src/bin/bind10/bind10.py.in Wed Aug 25 12:40:17 2010
@@ -18,7 +18,7 @@
"""\
This file implements the Boss of Bind (BoB, or bob) program.
-It's purpose is to start up the BIND 10 system, and then manage the
+Its purpose is to start up the BIND 10 system, and then manage the
processes, by starting and stopping processes, plus restarting
processes that exit.
Modified: branches/trac316/src/bin/bind10/run_bind10.sh.in
==============================================================================
--- branches/trac316/src/bin/bind10/run_bind10.sh.in (original)
+++ branches/trac316/src/bin/bind10/run_bind10.sh.in Wed Aug 25 12:40:17 2010
@@ -24,8 +24,15 @@
export PATH
PYTHONPATH=@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/lib/dns/python/.libs:@abs_top_builddir@/src/lib/xfr/.libs
-#PYTHONPATH=@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/lib/dns/.libs:@abs_top_builddir@/src/lib/xfr/.libs
export PYTHONPATH
+
+# If necessary (rare cases), explicitly specify paths to dynamic libraries
+# required by loadable python modules.
+SET_ENV_LIBRARY_PATH=@SET_ENV_LIBRARY_PATH@
+if test $SET_ENV_LIBRARY_PATH = yes; then
+ @ENV_LIBRARY_PATH@=@abs_top_builddir@/src/lib/dns/.libs:@abs_top_builddir@/src/lib/exceptions/.libs:$@ENV_LIBRARY_PATH@
+ export @ENV_LIBRARY_PATH@
+fi
B10_FROM_SOURCE=@abs_top_srcdir@
export B10_FROM_SOURCE
Modified: branches/trac316/src/bin/xfrin/tests/Makefile.am
==============================================================================
--- branches/trac316/src/bin/xfrin/tests/Makefile.am (original)
+++ branches/trac316/src/bin/xfrin/tests/Makefile.am Wed Aug 25 12:40:17 2010
@@ -1,5 +1,12 @@
PYTESTS = xfrin_test.py
EXTRA_DIST = $(PYTESTS)
+
+# If necessary (rare cases), explicitly specify paths to dynamic libraries
+# required by loadable python modules.
+LIBRARY_PATH_PLACEHOLDER =
+if SET_ENV_LIBRARY_PATH
+LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/xfr/.libs:$$$(ENV_LIBRARY_PATH)
+endif
# later will have configure option to choose this, like: coverage run --branch
PYCOVERAGE = $(PYTHON)
@@ -8,5 +15,6 @@
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
+ $(LIBRARY_PATH_PLACEHOLDER) \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/bin/xfrin/tests/xfrin_test.py
==============================================================================
--- branches/trac316/src/bin/xfrin/tests/xfrin_test.py (original)
+++ branches/trac316/src/bin/xfrin/tests/xfrin_test.py Wed Aug 25 12:40:17 2010
@@ -559,7 +559,7 @@
def raise_ccerror():
raise isc.cc.session.SessionError('test error')
-def raise_excpetion():
+def raise_exception():
raise Exception('test exception')
class TestMain(unittest.TestCase):
@@ -581,7 +581,7 @@
main(MockXfrin, False)
def test_startup_generalerror(self):
- MockXfrin.check_command_hook = raise_excpetion
+ MockXfrin.check_command_hook = raise_exception
main(MockXfrin, False)
if __name__== "__main__":
Modified: branches/trac316/src/bin/xfrout/tests/Makefile.am
==============================================================================
--- branches/trac316/src/bin/xfrout/tests/Makefile.am (original)
+++ branches/trac316/src/bin/xfrout/tests/Makefile.am Wed Aug 25 12:40:17 2010
@@ -1,5 +1,12 @@
PYTESTS = xfrout_test.py
EXTRA_DIST = $(PYTESTS)
+
+# If necessary (rare cases), explicitly specify paths to dynamic libraries
+# required by loadable python modules.
+LIBRARY_PATH_PLACEHOLDER =
+if SET_ENV_LIBRARY_PATH
+LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/xfr/.libs:$$$(ENV_LIBRARY_PATH)
+endif
# later will have configure option to choose this, like: coverage run --branch
PYCOVERAGE = $(PYTHON)
@@ -8,5 +15,6 @@
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_builddir)/src/bin/xfrout:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
+ $(LIBRARY_PATH_PLACEHOLDER) \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/lib/config/Makefile.am
==============================================================================
--- branches/trac316/src/lib/config/Makefile.am (original)
+++ branches/trac316/src/lib/config/Makefile.am Wed Aug 25 12:40:17 2010
@@ -1,4 +1,4 @@
-SUBDIRS = . tests
+SUBDIRS = . testdata tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
@@ -13,7 +13,7 @@
EXTRA_DIST += testdata/b10-config-bad2.db
EXTRA_DIST += testdata/b10-config-bad3.db
EXTRA_DIST += testdata/b10-config-bad4.db
-EXTRA_DIST += testdata/b10-config.db
+EXTRA_DIST += testdata/b10-config.db.master #.db will be auto-generated
EXTRA_DIST += testdata/data22_1.data
EXTRA_DIST += testdata/data22_2.data
EXTRA_DIST += testdata/data22_3.data
Modified: branches/trac316/src/lib/config/documentation.txt
==============================================================================
--- branches/trac316/src/lib/config/documentation.txt (original)
+++ branches/trac316/src/lib/config/documentation.txt Wed Aug 25 12:40:17 2010
@@ -53,7 +53,7 @@
The new_config is a ElementPtr pointing to a MapElement containing data in the form as specified by the specification file. It only contains values that were changed.
-The module can walk through this set and alter it's behaviour accordingly if necessary. It can also simply check them and return success (see below) and reference the needed configuration values directly when necessary by calling get_config_value(std::string identifier).
+The module can walk through this set and alter its behaviour accordingly if necessary. It can also simply check them and return success (see below) and reference the needed configuration values directly when necessary by calling get_config_value(std::string identifier).
The callback function must return an answer message, which is created with isc::config::createAnswer(). For successful handling of the configuration, it should return the result of createAnswer(0) (0 being the result code for success). If there is a problem, the function can return the result of createAnswer(non-zero, "string_with_error_message"). In this case, the new configuration is not stored, and the error is fed back to the configuration manager.
Modified: branches/trac316/src/lib/dns/messagerenderer.h
==============================================================================
--- branches/trac316/src/lib/dns/messagerenderer.h (original)
+++ branches/trac316/src/lib/dns/messagerenderer.h Wed Aug 25 12:40:17 2010
@@ -109,7 +109,7 @@
/// The destructor does nothing on the given \c buffer on construction;
/// in fact, it is expected that the user will use the resulting buffer
/// for some post rendering purposes (e.g., send the data to the network).
- /// It's user's responsibility to do any necessary cleanup for the
+ /// It's the user's responsibility to do any necessary cleanup for the
/// \c buffer.
~MessageRenderer();
//@}
Modified: branches/trac316/src/lib/dns/python/Makefile.am
==============================================================================
--- branches/trac316/src/lib/dns/python/Makefile.am (original)
+++ branches/trac316/src/lib/dns/python/Makefile.am Wed Aug 25 12:40:17 2010
@@ -1,9 +1,7 @@
SUBDIRS = tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
-if USE_GXX
-AM_CPPFLAGS += -Wno-write-strings
-endif
+AM_CXXFLAGS = $(B10_CXXFLAGS)
#lib_LTLIBRARIES = libdns_python_name.la libdns_python_rrset.la
#libdns_python_name_la_SOURCES = name_python.cc
Modified: branches/trac316/src/lib/dns/python/rrclass_python.cc
==============================================================================
--- branches/trac316/src/lib/dns/python/rrclass_python.cc (original)
+++ branches/trac316/src/lib/dns/python/rrclass_python.cc Wed Aug 25 12:40:17 2010
@@ -157,7 +157,7 @@
unsigned int i;
PyObject* bytes = NULL;
// The constructor argument can be a string ("IN"), an integer (1),
- // or a sequence of numbers between 0 and 255 (wire code)
+ // or a sequence of numbers between 0 and 65535 (wire code)
// Note that PyArg_ParseType can set PyError, and we need to clear
// that if we try several like here. Otherwise the *next* python
@@ -170,7 +170,7 @@
} else if (PyArg_ParseTuple(args, "I", &i)) {
PyErr_Clear();
if (i > 65535) {
- PyErr_SetString(po_InvalidRRClass, "Class number too high");
+ PyErr_SetString(po_InvalidRRClass, "RR class number too high");
return (-1);
}
self->rrclass = new RRClass(i);
Modified: branches/trac316/src/lib/dns/python/rrtype_python.cc
==============================================================================
--- branches/trac316/src/lib/dns/python/rrtype_python.cc (original)
+++ branches/trac316/src/lib/dns/python/rrtype_python.cc Wed Aug 25 12:40:17 2010
@@ -186,8 +186,8 @@
const char* s;
unsigned int i;
PyObject* bytes = NULL;
- // The constructor argument can be a string ("IN"), an integer (1),
- // or a sequence of numbers between 0 and 255 (wire code)
+ // The constructor argument can be a string ("A"), an integer (1),
+ // or a sequence of numbers between 0 and 65535 (wire code)
// Note that PyArg_ParseType can set PyError, and we need to clear
// that if we try several like here. Otherwise the *next* python
@@ -200,7 +200,7 @@
} else if (PyArg_ParseTuple(args, "I", &i)) {
PyErr_Clear();
if (i > 65535) {
- PyErr_SetString(po_InvalidRRType, "Class number too high");
+ PyErr_SetString(po_InvalidRRType, "RR Type number too high");
return (-1);
}
self->rrtype = new RRType(i);
Modified: branches/trac316/src/lib/dns/python/tests/Makefile.am
==============================================================================
--- branches/trac316/src/lib/dns/python/tests/Makefile.am (original)
+++ branches/trac316/src/lib/dns/python/tests/Makefile.am Wed Aug 25 12:40:17 2010
@@ -10,6 +10,13 @@
EXTRA_DIST = $(PYTESTS)
+# If necessary (rare cases), explicitly specify paths to dynamic libraries
+# required by loadable python modules.
+LIBRARY_PATH_PLACEHOLDER =
+if SET_ENV_LIBRARY_PATH
+LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$$$(ENV_LIBRARY_PATH)
+endif
+
# later will have configure option to choose this, like: coverage run --branch
PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
@@ -18,5 +25,6 @@
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
TESTDATA_PATH=$(abs_top_srcdir)/src/lib/dns/tests/testdata \
+ $(LIBRARY_PATH_PLACEHOLDER) \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/lib/python/isc/config/tests/Makefile.am
==============================================================================
--- branches/trac316/src/lib/python/isc/config/tests/Makefile.am (original)
+++ branches/trac316/src/lib/python/isc/config/tests/Makefile.am Wed Aug 25 12:40:17 2010
@@ -11,5 +11,6 @@
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
CONFIG_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/config/testdata \
+ CONFIG_WR_TESTDATA_PATH=$(abs_top_builddir)/src/lib/config/testdata \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/lib/python/isc/config/tests/cfgmgr_test.py
==============================================================================
--- branches/trac316/src/lib/python/isc/config/tests/cfgmgr_test.py (original)
+++ branches/trac316/src/lib/python/isc/config/tests/cfgmgr_test.py Wed Aug 25 12:40:17 2010
@@ -28,19 +28,20 @@
class TestConfigManagerData(unittest.TestCase):
def setUp(self):
self.data_path = os.environ['CONFIG_TESTDATA_PATH']
- self.config_manager_data = ConfigManagerData(self.data_path)
+ self.writable_data_path = os.environ['CONFIG_WR_TESTDATA_PATH']
+ self.config_manager_data = ConfigManagerData(self.writable_data_path)
self.assert_(self.config_manager_data)
def test_init(self):
self.assertEqual(self.config_manager_data.data['version'],
config_data.BIND10_CONFIG_DATA_VERSION)
self.assertEqual(self.config_manager_data.data_path,
- self.data_path)
+ self.writable_data_path)
self.assertEqual(self.config_manager_data.db_filename,
- self.data_path + os.sep + "b10-config.db")
+ self.writable_data_path + os.sep + "b10-config.db")
def test_read_from_file(self):
- ConfigManagerData.read_from_file(self.data_path)
+ ConfigManagerData.read_from_file(self.writable_data_path)
self.assertRaises(ConfigManagerDataEmpty,
ConfigManagerData.read_from_file,
"doesnotexist")
@@ -84,14 +85,15 @@
def setUp(self):
self.data_path = os.environ['CONFIG_TESTDATA_PATH']
+ self.writable_data_path = os.environ['CONFIG_WR_TESTDATA_PATH']
self.fake_session = FakeModuleCCSession()
- self.cm = ConfigManager(self.data_path, self.fake_session)
+ self.cm = ConfigManager(self.writable_data_path, self.fake_session)
self.name = "TestModule"
self.spec = isc.config.module_spec_from_file(self.data_path + os.sep + "/spec2.spec")
def test_init(self):
self.assert_(self.cm.module_specs == {})
- self.assert_(self.cm.data_path == self.data_path)
+ self.assert_(self.cm.data_path == self.writable_data_path)
self.assert_(self.cm.config != None)
self.assert_(self.fake_session.has_subscription("ConfigManager"))
self.assert_(self.fake_session.has_subscription("Boss", "ConfigManager"))
@@ -293,8 +295,8 @@
if __name__ == '__main__':
- if not 'CONFIG_TESTDATA_PATH' in os.environ:
- print("You need to set the environment variable CONFIG_TESTDATA_PATH to point to the directory containing the test data files")
+ if not 'CONFIG_TESTDATA_PATH' in os.environ or not 'CONFIG_WR_TESTDATA_PATH' in os.environ:
+ print("You need to set the environment variable CONFIG_TESTDATA_PATH and CONFIG_WR_TESTDATA_PATH to point to the directory containing the test data files")
exit(1)
unittest.main()
Modified: branches/trac316/src/lib/python/isc/config/tests/unittest_fakesession.py
==============================================================================
--- branches/trac316/src/lib/python/isc/config/tests/unittest_fakesession.py (original)
+++ branches/trac316/src/lib/python/isc/config/tests/unittest_fakesession.py Wed Aug 25 12:40:17 2010
@@ -1,4 +1,19 @@
+# Copyright (C) 2010 Internet Systems Consortium.
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# $Id$
#
# We can probably use a more general version of this
Modified: branches/trac316/src/lib/python/isc/log/tests/log_test.py
==============================================================================
--- branches/trac316/src/lib/python/isc/log/tests/log_test.py (original)
+++ branches/trac316/src/lib/python/isc/log/tests/log_test.py Wed Aug 25 12:40:17 2010
@@ -1,3 +1,22 @@
+# Copyright (C) 2010 Internet Systems Consortium.
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+#
+# Tests for the python logging module
+#
+
from isc.log.log import *
import unittest
import os
Modified: branches/trac316/src/lib/python/isc/notify/notify_out.py
==============================================================================
--- branches/trac316/src/lib/python/isc/notify/notify_out.py (original)
+++ branches/trac316/src/lib/python/isc/notify/notify_out.py Wed Aug 25 12:40:17 2010
@@ -256,7 +256,7 @@
def _zone_notify_handler(self, zone_notify_info, event_type):
'''Notify handler for one zone. The first notify message is
always triggered by the event "_EVENT_TIMEOUT" since when
- one zone prepares to notify its slaves, it's notify_timeout
+ one zone prepares to notify its slaves, its notify_timeout
is set to now, which is used to trigger sending notify
message when dispatcher() scanning zones. '''
tgt = zone_notify_info.get_current_notify_target()
Modified: branches/trac316/src/lib/python/isc/notify/tests/Makefile.am
==============================================================================
--- branches/trac316/src/lib/python/isc/notify/tests/Makefile.am (original)
+++ branches/trac316/src/lib/python/isc/notify/tests/Makefile.am Wed Aug 25 12:40:17 2010
@@ -1,5 +1,12 @@
PYTESTS = notify_out_test.py
EXTRA_DIST = $(PYTESTS)
+
+# If necessary (rare cases), explicitly specify paths to dynamic libraries
+# required by loadable python modules.
+LIBRARY_PATH_PLACEHOLDER =
+if SET_ENV_LIBRARY_PATH
+LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$$$(ENV_LIBRARY_PATH)
+endif
# later will have configure option to choose this, like: coverage run --branch
PYCOVERAGE = $(PYTHON)
@@ -8,5 +15,6 @@
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
+ $(LIBRARY_PATH_PLACEHOLDER) \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
More information about the bind10-changes
mailing list