/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_upgrade_stacked.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
 
29
29
 
30
30
def upgrade_scenarios():
31
 
    scenario_pairs = [ # old format, new format, model_change
32
 
#        ('knit', 'rich-root', True),
 
31
    scenario_pairs = [  # old format, new format, model_change
 
32
        #        ('knit', 'rich-root', True),
33
33
        ('knit', '1.6', False),
34
 
#        ('pack-0.92', '1.6', False),
 
34
        #        ('pack-0.92', '1.6', False),
35
35
        ('1.6', '1.6.1-rich-root', True),
36
36
        ]
37
37
    scenarios = []
38
38
    for (old_name, new_name, model_change) in scenario_pairs:
39
39
        name = old_name + ', ' + new_name
40
40
        scenarios.append((name,
41
 
            dict(scenario_old_format=old_name,
42
 
                scenario_new_format=new_name,
43
 
                scenario_model_change=model_change)))
 
41
                          dict(scenario_old_format=old_name,
 
42
                               scenario_new_format=new_name,
 
43
                               scenario_model_change=model_change)))
44
44
    return scenarios
45
45
 
46
46
 
51
51
    # TODO: This should possibly be repeated for all stacking repositories,
52
52
    # pairwise by rich/non-rich format; should possibly also try other kinds
53
53
    # of upgrades like knit->pack. -- mbp 20080804
54
 
    
 
54
 
55
55
    scenarios = upgrade_scenarios()
56
56
 
57
57
    def test_stack_upgrade(self):
62
62
        repository.
63
63
        """
64
64
        base = self.make_branch_and_tree('base',
65
 
            format=self.scenario_old_format)
 
65
                                         format=self.scenario_old_format)
66
66
        self.build_tree(['base/foo'])
67
67
        base.commit('base commit')
68
68
        # make another one stacked
78
78
        # changed; if just the data format has changed this should still work
79
79
        if self.scenario_model_change:
80
80
            self.assertRaises(errors.IncompatibleRepositories,
81
 
                stacked.open_branch)
 
81
                              stacked.open_branch)
82
82
        else:
83
83
            check.check_dwim('stacked', False, True, True)
84
84
        stacked = controldir.ControlDir.open('stacked')