← Back to branch summary

~ian-clatworthy/bzr/bzr.0.18

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-04 02:40:13 UTC
  • mfrom: (2578.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070704024013-cwx0ld720nvdfb8q
(Daniel Watkins) Bug #113990 - update should print summary of changes (like pull does)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
66
66
        # now branch should be out of date
67
67
        out,err = self.run_bzr('update branch')
68
68
        self.assertEqual('', out)
69
 
        self.assertEqual('All changes applied successfully.\n'
70
 
                         'Updated to revision 1.\n', err)
 
69
        self.assertContainsRe(err, '\+N  file')
 
70
        self.assertEndsWith(err, 'All changes applied successfully.\n'
 
71
                         'Updated to revision 1.\n')
71
72
        self.failUnlessExists('branch/file')
72
73
 
73
74
    def test_update_out_of_date_light_checkout(self):
80
81
        self.run_bzr('commit -m add-file checkout')
81
82
        # now checkout2 should be out of date
82
83
        out,err = self.run_bzr('update checkout2')
83
 
        self.assertEqual('All changes applied successfully.\n'
84
 
                         'Updated to revision 1.\n',
85
 
                         err)
 
84
        self.assertContainsRe(err, '\+N  file')
 
85
        self.assertEndsWith(err, 'All changes applied successfully.\n'
 
86
                         'Updated to revision 1.\n')
86
87
        self.assertEqual('', out)
87
88
 
88
89
    def test_update_conflicts_returns_2(self):
104
105
        a_file.write('Bar')
105
106
        a_file.close()
106
107
        out,err = self.run_bzr('update checkout2', retcode=1)
 
108
        self.assertContainsRe(err, 'M  file')
107
109
        self.assertEqual(['1 conflicts encountered.',
108
110
                          'Updated to revision 2.'],
109
 
                         err.split('\n')[1:3])
 
111
                         err.split('\n')[-3:-1])
110
112
        self.assertContainsRe(err, 'Text conflict in file\n')
111
113
        self.assertEqual('', out)
112
114
 
144
146
        # get all three files and a pending merge.
145
147
        out, err = self.run_bzr('update', 'checkout')
146
148
        self.assertEqual('', out)
 
149
        self.assertContainsRe(err, '\+N  file')
 
150
        self.assertContainsRe(err, '\+N  file_b')
147
151
        self.assertContainsRe(err, 'Updated to revision 1.\n'
148
152
                                   'Your local commits will now show as'
149
153
                                   ' pending merges')
192
196
        # merges, because they were real merges
193
197
        out, err = self.run_bzr('update')
194
198
        self.assertEqual('', out)
195
 
        self.assertEqual('All changes applied successfully.\n'
196
 
                         'Updated to revision 2.\n', err)
197
 
 
 
199
        self.assertEndsWith(err, 'All changes applied successfully.\n'
 
200
                         'Updated to revision 2.\n')
 
201
        self.assertContainsRe(err, r'\+N  file3')
198
202
        # The pending merges should still be there
199
203
        self.assertEqual(['o2'], checkout1.get_parent_ids()[1:])
200
204