mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00
Code Issues Releases Wiki Activity

[2853] Skip running test_find_mapped() where shared memory is not available

Browse Source
This commit is contained in:
Mukund Sivaraman
2013-06-07 05:15:15 +05:30
parent 358984aecf
commit 3d96ea46c8
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/python/isc/datasrc/tests/Makefile.am
View File

@@ -34,6 +34,11 @@ if ENABLE_PYTHON_COVERAGE
touch $(abs_top_srcdir)/.coverage touch $(abs_top_srcdir)/.coverage
rm -f .coverage rm -f .coverage
${LN_S} $(abs_top_srcdir)/.coverage .coverage ${LN_S} $(abs_top_srcdir)/.coverage .coverage
endif
if USE_SHARED_MEMORY
HAVE_SHARED_MEMORY=yes
else
HAVE_SHARED_MEMORY=no
endif endif
for pytest in $(PYTESTS) ; do \ for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \ echo Running test: $$pytest ; \
@@ -41,6 +46,7 @@ endif
PYTHONPATH=:$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/lib/python/isc/log:$(abs_top_builddir)/src/lib/python/isc/datasrc/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs \ PYTHONPATH=:$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/lib/python/isc/log:$(abs_top_builddir)/src/lib/python/isc/datasrc/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs \
TESTDATA_PATH=$(abs_srcdir)/testdata \ TESTDATA_PATH=$(abs_srcdir)/testdata \
TESTDATA_WRITE_PATH=$(abs_builddir) \ TESTDATA_WRITE_PATH=$(abs_builddir) \
HAVE_SHARED_MEMORY=$(HAVE_SHARED_MEMORY) \
GLOBAL_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/testutils/testdata \ GLOBAL_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/testutils/testdata \
B10_FROM_BUILD=$(abs_top_builddir) \ B10_FROM_BUILD=$(abs_top_builddir) \
$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \

3
src/lib/python/isc/datasrc/tests/clientlist_test.py
View File

@@ -170,6 +170,9 @@ class ClientListTest(unittest.TestCase):
""" """
Test find on a mapped segment. Test find on a mapped segment.
""" """
if os.environ['HAVE_SHARED_MEMORY'] != 'yes':
return
self.clist = isc.datasrc.ConfigurableClientList(isc.dns.RRClass.IN) self.clist = isc.datasrc.ConfigurableClientList(isc.dns.RRClass.IN)
self.clist.configure('''[{ self.clist.configure('''[{
"type": "MasterFiles", "type": "MasterFiles",