← 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: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
153
153
        conf.set_user_option('dpush_strict', value)
154
154
 
155
155
    _default_command = ['dpush', '../to']
156
 
    _default_pushed_revid = False # Doesn't aplly for dpush
157
 
 
158
 
    def assertPushSucceeds(self, args, pushed_revid=None, with_warning=False):
159
 
        if with_warning:
160
 
            error_regexes = self._default_errors
161
 
        else:
162
 
            error_regexes = []
163
 
        self.run_bzr(self._default_command + args,
164
 
                     working_dir=self._default_wd, error_regexes=error_regexes)
165
 
        if pushed_revid is None:
166
 
            # dpush change the revids, so we need to get back to it
167
 
            branch_from = branch.Branch.open(self._default_wd)
168
 
            pushed_revid = branch_from.last_revision()
169
 
        branch_to = branch.Branch.open('to')
170
 
        repo_to = branch_to.repository
171
 
        self.assertTrue(repo_to.has_revision(pushed_revid))
172
 
        self.assertEqual(branch_to.last_revision(), pushed_revid)
173
 
 
174
156
 
175
157
 
176
158
class TestDpushStrictWithoutChanges(TestDpushStrictMixin,