Browse Source

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

Mukund Sivaraman 12 years ago
parent
commit
3d96ea46c8

+ 6 - 0
src/lib/python/isc/datasrc/tests/Makefile.am

@@ -35,12 +35,18 @@ if ENABLE_PYTHON_COVERAGE
 	rm -f .coverage
 	${LN_S} $(abs_top_srcdir)/.coverage .coverage
 endif
+if USE_SHARED_MEMORY
+HAVE_SHARED_MEMORY=yes
+else
+HAVE_SHARED_MEMORY=no
+endif
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
 	$(LIBRARY_PATH_PLACEHOLDER) \
 	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_WRITE_PATH=$(abs_builddir) \
+	HAVE_SHARED_MEMORY=$(HAVE_SHARED_MEMORY) \
 	GLOBAL_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/testutils/testdata \
 	B10_FROM_BUILD=$(abs_top_builddir) \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \

+ 3 - 0
src/lib/python/isc/datasrc/tests/clientlist_test.py

@@ -170,6 +170,9 @@ class ClientListTest(unittest.TestCase):
         """
         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.configure('''[{
             "type": "MasterFiles",