Ticket #289: director_except_test.patch

xapian-bindings/python/pythontest2.py

@@ -992 +992 @@
     del db
     shutil.rmtree(dbpath)
 
+def test_director_exception():
+    """Test handling of an exception raised in a director.
 
+    """
+    dbpath = 'db_test_value_stats'
+    db = setup_database()
+    query = xapian.Query('it')
+    enq = xapian.Enquire(db)
+    enq.set_query(query)
+    class TestException(Exception):
+        def __init__(self, a, b):
+            Exception.__init__(self, a + b)
+
+    rset = xapian.RSet()
+    rset.add_document(1)
+    class EDecider(xapian.ExpandDecider):
+        def __call__(self, term):
+            raise TestException("foo", "bar")
+    edecider = EDecider()
+    expect_exception(TestException, "foobar", edecider, "foo")
+    expect_exception(TestException, "foobar", enq.get_eset, 10, rset, edecider)
+
+    class MDecider(xapian.MatchDecider):
+        def __call__(self, doc):
+            raise TestException("foo", "bar")
+    mdecider = MDecider()
+    expect_exception(TestException, "foobar", mdecider, xapian.Document())
+    expect_exception(TestException, "foobar", enq.get_mset, 0, 10, None, mdecider)
+
 # Run all tests (ie, callables with names starting "test_").
 if not runtests(globals(), sys.argv[1:]):
     sys.exit(1)

xapian-bindings/python/pythontest3.py

@@ -992 +992 @@
     del db
     shutil.rmtree(dbpath)
 
+def test_director_exception():
+    """Test handling of an exception raised in a director.
 
+    """
+    dbpath = 'db_test_value_stats'
+    db = setup_database()
+    query = xapian.Query('it')
+    enq = xapian.Enquire(db)
+    enq.set_query(query)
+    class TestException(Exception):
+        def __init__(self, a, b):
+            Exception.__init__(self, a + b)
+
+    rset = xapian.RSet()
+    rset.add_document(1)
+    class EDecider(xapian.ExpandDecider):
+        def __call__(self, term):
+            raise TestException("foo", "bar")
+    edecider = EDecider()
+    expect_exception(TestException, "foobar", edecider, "foo")
+    expect_exception(TestException, "foobar", enq.get_eset, 10, rset, edecider)
+
+    class MDecider(xapian.MatchDecider):
+        def __call__(self, doc):
+            raise TestException("foo", "bar")
+    mdecider = MDecider()
+    expect_exception(TestException, "foobar", mdecider, xapian.Document())
+    expect_exception(TestException, "foobar", enq.get_mset, 0, 10, None, mdecider)
+
 # Run all tests (ie, callables with names starting "test_").
 if not runtests(globals(), sys.argv[1:]):
     sys.exit(1)