/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_uncommit.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_uncommit.py
48
48
 
49
49
        os.chdir('tree')
50
50
        out, err = self.run_bzr('uncommit --dry-run --force')
51
 
        self.assertContainsRe(out, b'Dry-run')
52
 
        self.assertNotContainsRe(out, b'initial commit')
53
 
        self.assertContainsRe(out, b'second commit')
 
51
        self.assertContainsRe(out, 'Dry-run')
 
52
        self.assertNotContainsRe(out, 'initial commit')
 
53
        self.assertContainsRe(out, 'second commit')
54
54
 
55
55
        # Nothing has changed
56
56
        self.assertEqual([b'a2'], wt.get_parent_ids())
57
57
 
58
58
        # Uncommit, don't prompt
59
59
        out, err = self.run_bzr('uncommit --force')
60
 
        self.assertNotContainsRe(out, b'initial commit')
61
 
        self.assertContainsRe(out, b'second commit')
 
60
        self.assertNotContainsRe(out, 'initial commit')
 
61
        self.assertContainsRe(out, 'second commit')
62
62
 
63
63
        # This should look like we are back in revno 1
64
64
        self.assertEqual([b'a1'], wt.get_parent_ids())
65
65
        out, err = self.run_bzr('status')
66
 
        self.assertEqual(out, b'modified:\n  a\n')
 
66
        self.assertEqual(out, 'modified:\n  a\n')
67
67
 
68
68
    def test_uncommit_interactive(self):
69
69
        """Uncommit seeks confirmation, and doesn't proceed without it."""
82
82
    def test_uncommit_no_history(self):
83
83
        wt = self.make_branch_and_tree('tree')
84
84
        out, err = self.run_bzr('uncommit --force', retcode=1)
85
 
        self.assertEqual(b'', err)
86
 
        self.assertEqual(b'No revisions to uncommit.\n', out)
 
85
        self.assertEqual('', err)
 
86
        self.assertEqual('No revisions to uncommit.\n', out)
87
87
 
88
88
    def test_uncommit_checkout(self):
89
89
        wt = self.create_simple_tree()
93
93
 
94
94
        os.chdir('checkout')
95
95
        out, err = self.run_bzr('uncommit --dry-run --force')
96
 
        self.assertContainsRe(out, b'Dry-run')
97
 
        self.assertNotContainsRe(out, b'initial commit')
98
 
        self.assertContainsRe(out, b'second commit')
 
96
        self.assertContainsRe(out, 'Dry-run')
 
97
        self.assertNotContainsRe(out, 'initial commit')
 
98
        self.assertContainsRe(out, 'second commit')
99
99
 
100
100
        self.assertEqual([b'a2'], checkout_tree.get_parent_ids())
101
101
 
102
102
        out, err = self.run_bzr('uncommit --force')
103
 
        self.assertNotContainsRe(out, b'initial commit')
104
 
        self.assertContainsRe(out, b'second commit')
 
103
        self.assertNotContainsRe(out, 'initial commit')
 
104
        self.assertContainsRe(out, 'second commit')
105
105
 
106
106
        # uncommit in a checkout should uncommit the parent branch
107
107
        # (but doesn't effect the other working tree)
147
147
        os.chdir('tree')
148
148
        out, err = self.run_bzr('uncommit -r1 --force')
149
149
 
150
 
        self.assertNotContainsRe(out, b'initial commit')
151
 
        self.assertContainsRe(out, b'second commit')
 
150
        self.assertNotContainsRe(out, 'initial commit')
 
151
        self.assertContainsRe(out, 'second commit')
152
152
        self.assertEqual([b'a1'], wt.get_parent_ids())
153
153
        self.assertEqual(b'a1', wt.branch.last_revision())
154
154
 
156
156
        wt = self.create_simple_tree()
157
157
        os.chdir('tree')
158
158
        out, err = self.run_bzr('uncommit -r -1', retcode=1)
159
 
        self.assertEqual(b'No revisions to uncommit.\n', out)
 
159
        self.assertEqual('No revisions to uncommit.\n', out)
160
160
 
161
161
    def test_uncommit_merges(self):
162
162
        wt = self.create_simple_tree()
279
279
        tree = self.make_branch_and_tree('tree')
280
280
        tree.commit(u'\u1234 message')
281
281
        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
282
 
        self.assertContainsRe(out, br'\? message')
 
282
        self.assertContainsRe(out, r'\? message')
283
283
 
284
284
    def test_uncommit_removes_tags(self):
285
285
        tree = self.make_branch_and_tree('tree')