← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-01 07:30:00 UTC
  • mfrom: (2220.2.49 tags)
  • Revision ID: pqm@pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
(mbp) tags in branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
297
297
        bundle_file.close()
298
298
 
299
299
        os.chdir('../branch_b')
300
 
        output = self.run_bzr('pull', '../bundle')
301
 
        self.assertEqual('', output[0])
302
 
        self.assertEqual(' M  a\nAll changes applied successfully.\n'
303
 
                         '1 revision(s) pulled.\n', output[1])
 
300
        out, err = self.run_bzr('pull', '../bundle')
 
301
        self.assertEqual(out,
 
302
                         'Now on revision 2.\n')
 
303
        self.assertEqual(err,
 
304
                ' M  a\nAll changes applied successfully.\n')
304
305
 
305
306
        self.assertEqualDiff(tree_a.branch.revision_history(),
306
307
                             tree_b.branch.revision_history())
313
314
                             testament_b.as_text())
314
315
 
315
316
        # it is legal to attempt to pull an already-merged bundle
316
 
        output = self.run_bzr('pull', '../bundle')
317
 
        self.assertEqual('', output[0])
318
 
        self.assertEqual('0 revision(s) pulled.\n', output[1])
 
317
        out, err = self.run_bzr('pull', '../bundle')
 
318
        self.assertEqual(err, '')
 
319
        self.assertEqual(out, 'No revisions to pull.\n')