svn commit: r1571320 - /bloodhound/trunk/bloodhound_multiproduct/tests/env.py

[rj...@apache.org]

Author: rjollos
Date: Mon Feb 24 15:30:06 2014
New Revision: 1571320

URL: http://svn.apache.org/r1571320
Log:
0.8dev: Fix for //Trac environment needs to be upgraded// error message when running !TracAdmin tests. Refs #756, #757.

Patch by Olemis Lang.

Modified:
    bloodhound/trunk/bloodhound_multiproduct/tests/env.py

Modified: bloodhound/trunk/bloodhound_multiproduct/tests/env.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/env.py?rev=1571320&r1=1571319&r2=1571320&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/env.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/env.py Mon Feb 24 15:30:06 2014
@@ -38,7 +38,7 @@ from trac.ticket.web_ui import TicketMod
 from trac.util.text import to_unicode
 from trac.web.href import Href
 
-from multiproduct.api import MultiProductSystem
+from multiproduct.api import DB_VERSION, MultiProductSystem
 from multiproduct.env import ProductEnvironment
 from multiproduct.model import Product
 
@@ -232,12 +232,16 @@ class MultiproductTestCase(unittest.Test
         EnvironmentStub.disable_component_in_config(env, ReportModule)
 
         mpsystem = MultiProductSystem(env)
-        try:
-            mpsystem.upgrade_environment(env.db_transaction)
-        except env.db_exc.OperationalError:
-            # Database is upgraded, but database version was deleted.
-            # Complete the upgrade by inserting default product.
-            mpsystem._insert_default_product(env.db_transaction)
+        with env.db_transaction as db:
+            try:
+                mpsystem.upgrade_environment(db)
+            except env.db_exc.OperationalError:
+                # Database is upgraded, but database version was deleted.
+                # Complete the upgrade by inserting default product.
+                mpsystem._insert_default_product(db)
+            finally:
+                # Ensure that multiproduct DB version is set to latest value
+                mpsystem._update_db_version(db, DB_VERSION)
         # assume that the database schema has been upgraded, enable
         # multi-product schema support in environment
         env.enable_multiproduct_schema(True)