From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 8 Oct 2012 18:53:13 +0000 (-0400)
Subject: - add a nifty contextmanager form of assert_execution/assert_statement_count
X-Git-Tag: rel_0_8_0b1~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e28e1c998948a606fa0db91b473dd598fead4da;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- add a nifty contextmanager form of assert_execution/assert_statement_count
---

diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index 2b305b98a6..e74d13a977 100644
--- a/lib/sqlalchemy/testing/assertions.py
+++ b/lib/sqlalchemy/testing/assertions.py
@@ -14,6 +14,7 @@ from . import assertsql
 from . import config
 import itertools
 from .util import fail
+import contextlib
 
 def emits_warning(*messages):
     """Mark a test as emitting a warning.
@@ -348,4 +349,14 @@ class AssertsExecutionResults(object):
     def assert_sql_count(self, db, callable_, count):
         self.assert_sql_execution(db, callable_, assertsql.CountStatements(count))
 
+    @contextlib.contextmanager
+    def assert_execution(self, *rules):
+        assertsql.asserter.add_rules(rules)
+        try:
+            yield
+            assertsql.asserter.statement_complete()
+        finally:
+            assertsql.asserter.clear_rules()
 
+    def assert_statement_count(self, count):
+        return self.assert_execution(assertsql.CountStatements(count))
\ No newline at end of file