From 4044923a00d8d2d176a83bde585e512842bddbf4 Mon Sep 17 00:00:00 2001 From: Yusuke Muraoka <yusuke@nexedi.com> Date: Mon, 1 Mar 2010 07:13:13 +0000 Subject: [PATCH] simplify. thanks nicolas. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33158 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5Catalog/tests/testERP5Catalog.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/product/ERP5Catalog/tests/testERP5Catalog.py b/product/ERP5Catalog/tests/testERP5Catalog.py index 22731635ff..2a01e105cf 100644 --- a/product/ERP5Catalog/tests/testERP5Catalog.py +++ b/product/ERP5Catalog/tests/testERP5Catalog.py @@ -2351,15 +2351,10 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): operator='AND') self.assertEqual(len(catalog(query=query_find_name_erp5)), 2) - try: - query = ComplexQuery(query_find_european, - query_find_name_erp5, - operator='OR') - except NotImplementedError: - # correct behaviour for now - raise - else: - self.fail("In this query pattern, ComplexQuery doesn't return valid result.") + self.assertRaises(NotImplementedError, + lambda : ComplexQuery(query_find_european, + query_find_name_erp5, + operator='OR')) def test_check_security_table_content(self, quiet=quiet, run=run_all_test): sql_connection = self.getSQLConnection() -- 2.30.9