Author: astaric Date: Mon May 27 15:38:00 2013 New Revision: 1486642 URL: http://svn.apache.org/r1486642 Log: Database should always contain default product after _upgrade_mp is run.
Inconsistent behavior caused some tests to pass if run standalone, but fail as a part of the suite. Modified: bloodhound/trunk/bloodhound_multiproduct/tests/env.py bloodhound/trunk/bloodhound_multiproduct/tests/wiki/formatter.py Modified: bloodhound/trunk/bloodhound_multiproduct/tests/env.py URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/env.py?rev=1486642&r1=1486641&r2=1486642&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_multiproduct/tests/env.py (original) +++ bloodhound/trunk/bloodhound_multiproduct/tests/env.py Mon May 27 15:38:00 2013 @@ -230,8 +230,9 @@ class MultiproductTestCase(unittest.Test try: self.mpsystem.upgrade_environment(env.db_transaction) except OperationalError: - # table remains but database version is deleted - pass + # Database is upgraded, but database version was deleted. + # Complete the upgrade by inserting default product. + self.mpsystem._insert_default_product(env.db_transaction) # assume that the database schema has been upgraded, enable # multi-product schema support in environment env.enable_multiproduct_schema(True) Modified: bloodhound/trunk/bloodhound_multiproduct/tests/wiki/formatter.py URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/wiki/formatter.py?rev=1486642&r1=1486641&r2=1486642&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_multiproduct/tests/wiki/formatter.py (original) +++ bloodhound/trunk/bloodhound_multiproduct/tests/wiki/formatter.py Mon May 27 15:38:00 2013 @@ -33,8 +33,6 @@ from multiproduct.model import Product from tests.env import MultiproductTestCase - - class ProductWikiTestCase(formatter.WikiTestCase, MultiproductTestCase): maxDiff = None