Rearrange profiling a bit

diff --git a/test/perf/ormsession.py b/test/perf/ormsession.py
index d0f4e6ecbf73443cb67846648afbdf89fc075fe3..a9d310ef68ead197f3f1048bd7549e12ecd1181e 100644 (file)
--- a/test/perf/ormsession.py
+++ b/test/perf/ormsession.py
@@ -199,22 +199,27 @@ def create_purchase():
     session.commit()
     session.expire(customer)
 
-
 def setup_db():
     metadata.drop_all()
     metadata.create_all()
 def cleanup_db():
     metadata.drop_all()
 
+@profiled('default')
+def default():
+    run_queries()
+    create_purchase()
+
 @profiled('all')
 def main():
     metadata.bind = testbase.db
-    define_tables()
-    setup_mappers()
-    setup_db()
-    insert_data()
-    run_queries()
-    create_purchase()
-    cleanup_db()
+    try:
+        define_tables()
+        setup_mappers()
+        setup_db()
+        insert_data()
+        default()
+    finally:
+        cleanup_db()
 
 main()