← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_missing.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-16 19:18:39 UTC
  • mto: This revision was merged to the branch mainline in revision 6391.
  • Revision ID: jelmer@samba.org-20111216191839-eg681lxqibi1qxu1
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_missing.py
49
49
        self.assertEqual('', err)
50
50
 
51
51
    def test_missing(self):
52
 
        missing = "You are missing 1 revision(s):"
 
52
        missing = "You are missing 1 revision:"
53
53
 
54
54
        # create a source branch
55
55
        a_tree = self.make_branch_and_tree('a')
92
92
 
93
93
        # compare again, but now we have the 'merge' commit extra
94
94
        lines = self.run_bzr('missing ../b', retcode=1)[0].splitlines()
95
 
        self.assertEqual("You have 1 extra revision(s):", lines[0])
 
95
        self.assertEqual("You have 1 extra revision:", lines[0])
96
96
        self.assertEqual(8, len(lines))
97
97
        lines2 = self.run_bzr('missing ../b --mine-only', retcode=1)[0]
98
98
        lines2 = lines2.splitlines()
99
99
        self.assertEqual(lines, lines2)
100
100
        lines3 = self.run_bzr('missing ../b --theirs-only', retcode=0)[0]
101
 
        self.assertEqualDiff('Other branch is up to date.\n', lines3)
 
101
        self.assertEqualDiff('Other branch has no new revisions.\n', lines3)
102
102
 
103
103
        # relative to a, missing the 'merge' commit
104
104
        os.chdir('../b')
109
109
        lines2 = lines2.splitlines()
110
110
        self.assertEqual(lines, lines2)
111
111
        lines3 = self.run_bzr('missing ../a --mine-only', retcode=0)[0]
112
 
        self.assertEqualDiff('This branch is up to date.\n', lines3)
 
112
        self.assertEqualDiff('This branch has no new revisions.\n', lines3)
113
113
        lines4 = self.run_bzr('missing ../a --short', retcode=1)[0]
114
114
        lines4 = lines4.splitlines()
115
115
        self.assertEqual(4, len(lines4))
 
116
        lines4a = self.run_bzr('missing ../a -S', retcode=1)[0]
 
117
        lines4a = lines4a.splitlines()
 
118
        self.assertEqual(lines4, lines4a)
116
119
        lines5 = self.run_bzr('missing ../a --line', retcode=1)[0]
117
120
        lines5 = lines5.splitlines()
118
121
        self.assertEqual(2, len(lines5))
128
131
        self.assertEqual("  a", lines8[-1])
129
132
 
130
133
        os.chdir('../a')
131
 
        self.assertEqualDiff('Other branch is up to date.\n',
 
134
        self.assertEqualDiff('Other branch has no new revisions.\n',
132
135
                             self.run_bzr('missing ../b --theirs-only')[0])
133
136
 
134
137
        # after a pull we're back on track
139
142
        self.assertEqualDiff('Branches are up to date.\n',
140
143
                             self.run_bzr('missing ../a')[0])
141
144
        # If you supply mine or theirs you only know one side is up to date
142
 
        self.assertEqualDiff('This branch is up to date.\n',
 
145
        self.assertEqualDiff('This branch has no new revisions.\n',
143
146
                             self.run_bzr('missing ../a --mine-only')[0])
144
 
        self.assertEqualDiff('Other branch is up to date.\n',
 
147
        self.assertEqualDiff('Other branch has no new revisions.\n',
145
148
                             self.run_bzr('missing ../a --theirs-only')[0])
146
149
 
147
150
    def test_missing_filtered(self):
214
217
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
215
218
        self.build_tree_contents([('b/a', 'initial\nmore\n')])
216
219
        b_tree.commit(message='more')
217
 
        
 
220
 
218
221
        out2, err2 = self.run_bzr('missing --directory a b', retcode=1)
219
222
        os.chdir('a')
220
223
        out1, err1 = self.run_bzr('missing ../b', retcode=1)