/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/blackbox/test_conflicts.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_conflicts.py
120
120
    encoding = "ascii"
121
121
 
122
122
    def setUp(self):
123
 
        self.skip("Need to decide if replacing is the desired behaviour")
 
123
        self.skipTest("Need to decide if replacing is the desired behaviour")
124
124
 
125
125
    def _as_output(self, text):
126
126
        return text.encode(self.encoding, "replace")