← 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: John Arbash Meinel
  • Date: 2008-09-09 15:09:12 UTC
  • mto: This revision was merged to the branch mainline in revision 3699.
  • Revision ID: john@arbash-meinel.com-20080909150912-wyttm8he1zsls2ck
Use the right timing function on win32

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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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,
23
22
    errors,
24
23
    tests,
25
24
    )
33
32
 
34
33
    def test_stack_upgrade(self):
35
34
        """Correct checks when stacked-on repository is upgraded.
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
 
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 
39
38
        repository.
40
39
        """
41
40
        base = self.make_branch_and_tree('base',
57
56
            self.assertRaises(errors.IncompatibleRepositories,
58
57
                stacked.open_branch)
59
58
        else:
60
 
            check.check_dwim('stacked', False, True, True)
 
59
            stacked.open_branch().check()
61
60
        stacked = bzrdir.BzrDir.open('stacked')
62
61
        # but we can upgrade the stacked repository
63
62
        upgrade('stacked', new_format)
64
 
        # and now it opens ok
 
63
        # and now it's ok
65
64
        stacked = bzrdir.BzrDir.open('stacked')
66
 
        # And passes check.
67
 
        check.check_dwim('stacked', False, True, True)
68
 
 
69
 
 
70
 
def load_tests(basic_tests, module, loader):
 
65
        stacked.open_branch().check()
 
66
 
 
67
 
 
68
def load_tests(basic_tests, module, test_loader):
71
69
    """Generate dynamic scenario tests.
72
70
 
73
71
    Called by the bzrlib test framework.
85
83
            dict(scenario_old_format=old_name,
86
84
                scenario_new_format=new_name,
87
85
                scenario_model_change=model_change)))
88
 
    suite = loader.suiteClass()
89
 
    return tests.multiply_tests(basic_tests, scenarios, suite)
 
86
    adapter = tests.TestScenarioApplier()
 
87
    adapter.scenarios = scenarios
 
88
    suite = tests.TestSuite()
 
89
    tests.adapt_tests(basic_tests, adapter, suite)
 
90
    return suite