← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade_stacked.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade_stacked.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Tests for upgrades of various stacking situations."""
32
32
 
33
33
    def test_stack_upgrade(self):
34
34
        """Correct checks when stacked-on repository is upgraded.
35
 
        
36
 
        We initially stack on a repo with the same rich root support, 
37
 
        we then upgrade it and should fail, we then upgrade the overlaid 
 
35
 
 
36
        We initially stack on a repo with the same rich root support,
 
37
        we then upgrade it and should fail, we then upgrade the overlaid
38
38
        repository.
39
39
        """
40
40
        base = self.make_branch_and_tree('base',
65
65
        stacked.open_branch().check()
66
66
 
67
67
 
68
 
def load_tests(basic_tests, module, test_loader):
 
68
def load_tests(basic_tests, module, loader):
69
69
    """Generate dynamic scenario tests.
70
70
 
71
71
    Called by the bzrlib test framework.
83
83
            dict(scenario_old_format=old_name,
84
84
                scenario_new_format=new_name,
85
85
                scenario_model_change=model_change)))
86
 
    adapter = tests.TestScenarioApplier()
87
 
    adapter.scenarios = scenarios
88
 
    suite = tests.TestSuite()
89
 
    tests.adapt_tests(basic_tests, adapter, suite)
90
 
    return suite
 
86
    suite = loader.suiteClass()
 
87
    return tests.multiply_tests(basic_tests, scenarios, suite)