/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_remove_tree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-14 19:47:11 UTC
  • mfrom: (7027.4.12 python3-blackbox)
  • Revision ID: breezy.the.bot@gmail.com-20180714194711-h73vd0gzphiab6vf
Change run_bzr to use StringIOWithEncoding for stderr and stdout on python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-blackbox/+merge/349090

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_remove_tree.py
103
103
    def test_remove_tree_repeatedly(self):
104
104
        self.run_bzr('remove-tree branch1')
105
105
        self.assertPathDoesNotExist('branch1/foo')
106
 
        output = self.run_bzr_error([b"No working tree to remove"],
 
106
        output = self.run_bzr_error(["No working tree to remove"],
107
107
                                    'remove-tree branch1', retcode=3)
108
108
 
109
109
    def test_remove_tree_remote_path(self):
113
113
    def test_remove_tree_uncommitted_changes(self):
114
114
        self.build_tree(['branch1/bar'])
115
115
        self.tree.add('bar')
116
 
        output = self.run_bzr_error([b"Working tree .* has uncommitted changes"],
 
116
        output = self.run_bzr_error(["Working tree .* has uncommitted changes"],
117
117
                                    'remove-tree branch1', retcode=3)
118
118
 
119
119
    def test_remove_tree_uncommitted_changes_force(self):
133
133
        self.assertPathExists('branch2/bar')
134
134
        self.run_bzr(['revert', '.'], working_dir='branch2')
135
135
        self.assertPathDoesNotExist('branch2/bar')
136
 
        output = self.run_bzr_error([b"Working tree .* has uncommitted changes"],
 
136
        output = self.run_bzr_error(["Working tree .* has uncommitted changes"],
137
137
                                    'remove-tree branch2', retcode=3)
138
138
 
139
139
    def test_remove_tree_pending_merges_force(self):
156
156
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
157
157
        self.addCleanup(creator.finalize)
158
158
        shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
159
 
        output = self.run_bzr_error([b"Working tree .* has shelved changes"],
 
159
        output = self.run_bzr_error(["Working tree .* has shelved changes"],
160
160
                                    'remove-tree', retcode=3)
161
161
 
162
162
    def test_remove_tree_shelved_changes_force(self):