← 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: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
1
 
# Copyright (C) 2009-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2009, 2010, 2011 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
19
19
 
20
20
 
21
21
from bzrlib import (
22
 
    branch,
23
22
    tests,
24
23
    )
25
24
from bzrlib.tests import (
53
52
        target_tree = self.make_branch_and_tree("dp")
54
53
        source_tree = self.make_branch_and_tree("dc")
55
54
        output, error = self.run_bzr("dpush -d dc dp", retcode=3)
56
 
        self.assertEqual("", output)
 
55
        self.assertEquals("", output)
57
56
        self.assertContainsRe(error,
58
57
            'in the same VCS, lossy push not necessary. Please use regular '
59
58
            'push.')
132
131
          [('modify', ('fooid', 'blie'))])
133
132
 
134
133
        output, error = self.run_bzr("dpush -d dc d", retcode=3)
135
 
        self.assertEqual(output, "")
 
134
        self.assertEquals(output, "")
136
135
        self.assertContainsRe(error, "have diverged")
137
136
 
138
137
 
145
144
            'to', format=test_foreign.DummyForeignVcsDirFormat())
146
145
 
147
146
    def set_config_push_strict(self, value):
148
 
        br = branch.Branch.open('local')
149
 
        br.get_config_stack().set('dpush_strict', value)
 
147
        # set config var (any of bazaar.conf, locations.conf, branch.conf
 
148
        # should do)
 
149
        conf = self.tree.branch.get_config_stack()
 
150
        conf.set('dpush_strict', value)
150
151
 
151
152
    _default_command = ['dpush', '../to']
152
153