← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2009-12-22 08:05:57 UTC
  • mto: This revision was merged to the branch mainline in revision 4923.
  • Revision ID: mbp@sourcefrog.net-20091222080557-3bntdhe1tu04qo5w
Don't show extra message about updating from master; it's fairly redundant

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
68
68
    def test_update_up_to_date_checkout(self):
69
69
        self.make_branch_and_tree('branch')
70
70
        self.run_bzr('checkout branch checkout')
71
 
        out, err = self.run_bzr('update checkout')
72
 
        self.assertEqual('Tree is up to date at revision 0 of branch %s\n'
73
 
                         % osutils.pathjoin(self.test_dir, 'branch'),
74
 
                         err)
75
 
        self.assertEqual('', out)
 
71
        sr = ScriptRunner()
 
72
        sr.run_script(self, '''
 
73
$ bzr update checkout
 
74
2> Tree is up to date at revision 0 of branch .../branch
 
75
''')
76
76
 
77
77
    def test_update_out_of_date_standalone_tree(self):
78
78
        # FIXME the default format has to change for this to pass
311
311
        sr = ScriptRunner()
312
312
        sr.run_script(self, '''
313
313
$ bzr update -r revid:m2
314
 
2>Updating branch .../branch/ from master
315
314
2>+N  file2
316
315
2>All changes applied successfully.
317
316
2>Updated to revision 2 of branch .../master