← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_dpush.py

  • Committer: Colin Watson
  • Date: 2015-07-02 11:30:47 UTC
  • mto: This revision was merged to the branch mainline in revision 6605.
  • Revision ID: cjwatson@canonical.com-20150702113047-359s4zsi07wvfwso
Use assertLength.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
1
 
# Copyright (C) 2005, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2009-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
"""Black-box tests for bzr dpush."""
19
19
 
20
20
 
21
 
import os
22
 
 
23
21
from bzrlib import (
24
22
    branch,
25
 
    bzrdir,
26
 
    foreign,
27
23
    tests,
28
 
    workingtree,
29
24
    )
30
25
from bzrlib.tests import (
31
 
    blackbox,
 
26
    script,
32
27
    test_foreign,
33
28
    )
34
29
from bzrlib.tests.blackbox import test_push
35
 
 
36
 
 
37
 
def load_tests(standard_tests, module, loader):
38
 
    """Multiply tests for the dpush command."""
39
 
    result = loader.suiteClass()
40
 
 
41
 
    # one for each king of change
42
 
    changes_tests, remaining_tests = tests.split_suite_by_condition(
43
 
        standard_tests, tests.condition_isinstance((
44
 
                TestDpushStrictWithChanges,
45
 
                )))
46
 
    changes_scenarios = [
47
 
        ('uncommitted',
48
 
         dict(_changes_type= '_uncommitted_changes')),
49
 
        ('pending-merges',
50
 
         dict(_changes_type= '_pending_merges')),
51
 
        ('out-of-sync-trees',
52
 
         dict(_changes_type= '_out_of_sync_trees')),
53
 
        ]
54
 
    tests.multiply_tests(changes_tests, changes_scenarios, result)
55
 
    # No parametrization for the remaining tests
56
 
    result.addTests(remaining_tests)
57
 
 
58
 
    return result
59
 
 
60
 
 
61
 
class TestDpush(blackbox.ExternalBase):
 
30
from bzrlib.tests.scenarios import (
 
31
    load_tests_apply_scenarios,
 
32
    )
 
33
 
 
34
 
 
35
load_tests = load_tests_apply_scenarios
 
36
 
 
37
 
 
38
class TestDpush(tests.TestCaseWithTransport):
62
39
 
63
40
    def setUp(self):
64
41
        super(TestDpush, self).setUp()
77
54
        source_tree = self.make_branch_and_tree("dc")
78
55
        output, error = self.run_bzr("dpush -d dc dp", retcode=3)
79
56
        self.assertEquals("", output)
80
 
        self.assertContainsRe(error, 'in the same VCS, lossy push not necessary. Please use regular push.')
 
57
        self.assertContainsRe(error,
 
58
            'in the same VCS, lossy push not necessary. Please use regular '
 
59
            'push.')
81
60
 
82
61
    def test_dpush(self):
83
62
        branch = self.make_dummy_builder('d').get_branch()
86
65
        self.build_tree(("dc/foo", "blaaaa"))
87
66
        dc.open_workingtree().commit('msg')
88
67
 
89
 
        output, error = self.run_bzr("dpush -d dc d")
90
 
        self.assertEquals(error, "Pushed up to revision 2.\n")
91
 
        self.check_output("", "status dc")
 
68
        script.run_script(self, """
 
69
            $ bzr dpush -d dc d
 
70
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
 
71
            2>This may take some time. Upgrade the repositories to the same format for better performance.
 
72
            2>Pushed up to revision 2.
 
73
            $ bzr status dc
 
74
            """)
92
75
 
93
76
    def test_dpush_new(self):
94
77
        b = self.make_dummy_builder('d').get_branch()
99
82
        dc_tree.add("foofile")
100
83
        dc_tree.commit("msg")
101
84
 
102
 
        self.check_output("", "dpush -d dc d")
103
 
        self.check_output("2\n", "revno dc")
104
 
        self.check_output("", "status dc")
 
85
        script.run_script(self, '''
 
86
            $ bzr dpush -d dc d
 
87
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
 
88
            2>This may take some time. Upgrade the repositories to the same format for better performance.
 
89
            2>Pushed up to revision 2.
 
90
            $ bzr revno dc
 
91
            2
 
92
            $ bzr status dc
 
93
            ''')
105
94
 
106
95
    def test_dpush_wt_diff(self):
107
96
        b = self.make_dummy_builder('d').get_branch()
113
102
        newrevid = dc_tree.commit('msg')
114
103
 
115
104
        self.build_tree_contents([("dc/foofile", "blaaaal")])
116
 
        self.check_output("", "dpush -d dc d --no-strict")
 
105
        script.run_script(self, '''
 
106
            $ bzr dpush -d dc d --no-strict
 
107
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
 
108
            2>This may take some time. Upgrade the repositories to the same format for better performance.
 
109
            2>Pushed up to revision 2.
 
110
            ''')
117
111
        self.assertFileEqual("blaaaal", "dc/foofile")
118
112
        # if the dummy vcs wasn't that dummy we could uncomment the line below
119
113
        # self.assertFileEqual("blaaaa", "d/foofile")
120
 
        self.check_output('modified:\n  foofile\n', "status dc")
 
114
        script.run_script(self, '''
 
115
            $ bzr status dc
 
116
            modified:
 
117
              foofile
 
118
            ''')
121
119
 
122
120
    def test_diverged(self):
123
121
        builder = self.make_dummy_builder('d')
147
145
            'to', format=test_foreign.DummyForeignVcsDirFormat())
148
146
 
149
147
    def set_config_push_strict(self, value):
150
 
        # set config var (any of bazaar.conf, locations.conf, branch.conf
151
 
        # should do)
152
 
        conf = self.tree.branch.get_config()
153
 
        conf.set_user_option('dpush_strict', value)
 
148
        br = branch.Branch.open('local')
 
149
        br.get_config_stack().set('dpush_strict', value)
154
150
 
155
151
    _default_command = ['dpush', '../to']
156
 
    _default_pushed_revid = False # Doesn't aplly for dpush
157
 
 
158
 
    def assertPushSucceeds(self, args, pushed_revid=None):
159
 
        self.run_bzr(self._default_command + args,
160
 
                     working_dir=self._default_wd)
161
 
        if pushed_revid is None:
162
 
            # dpush change the revids, so we need to get back to it
163
 
            branch_from = branch.Branch.open(self._default_wd)
164
 
            pushed_revid = branch_from.last_revision()
165
 
        branch_to = branch.Branch.open('to')
166
 
        repo_to = branch_to.repository
167
 
        self.assertTrue(repo_to.has_revision(pushed_revid))
168
 
        self.assertEqual(branch_to.last_revision(), pushed_revid)
169
 
 
170
152
 
171
153
 
172
154
class TestDpushStrictWithoutChanges(TestDpushStrictMixin,
180
162
class TestDpushStrictWithChanges(TestDpushStrictMixin,
181
163
                                 test_push.TestPushStrictWithChanges):
182
164
 
 
165
    scenarios = test_push.strict_push_change_scenarios
 
166
 
183
167
    _changes_type = None # Set by load_tests
184
168
 
185
169
    def setUp(self):
188
172
 
189
173
    def test_push_with_revision(self):
190
174
        raise tests.TestNotApplicable('dpush does not handle --revision')
191