← 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: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on 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."""
19
19
 
20
20
from bzrlib import (
21
21
    bzrdir,
 
22
    check,
22
23
    errors,
23
24
    tests,
24
25
    )
32
33
 
33
34
    def test_stack_upgrade(self):
34
35
        """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 
 
36
 
 
37
        We initially stack on a repo with the same rich root support,
 
38
        we then upgrade it and should fail, we then upgrade the overlaid
38
39
        repository.
39
40
        """
40
41
        base = self.make_branch_and_tree('base',
56
57
            self.assertRaises(errors.IncompatibleRepositories,
57
58
                stacked.open_branch)
58
59
        else:
59
 
            stacked.open_branch().check()
 
60
            check.check_dwim('stacked', False, True, True)
60
61
        stacked = bzrdir.BzrDir.open('stacked')
61
62
        # but we can upgrade the stacked repository
62
63
        upgrade('stacked', new_format)
63
 
        # and now it's ok
 
64
        # and now it opens ok
64
65
        stacked = bzrdir.BzrDir.open('stacked')
65
 
        stacked.open_branch().check()
66
 
 
67
 
 
68
 
def load_tests(basic_tests, module, test_loader):
 
66
        # And passes check.
 
67
        check.check_dwim('stacked', False, True, True)
 
68
 
 
69
 
 
70
def load_tests(basic_tests, module, loader):
69
71
    """Generate dynamic scenario tests.
70
72
 
71
73
    Called by the bzrlib test framework.
83
85
            dict(scenario_old_format=old_name,
84
86
                scenario_new_format=new_name,
85
87
                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
 
88
    suite = loader.suiteClass()
 
89
    return tests.multiply_tests(basic_tests, scenarios, suite)