← 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: 2011-09-01 20:21:14 UTC
  • mfrom: (6113.1.4 wt-foreign-test-fixes)
  • Revision ID: pqm@pqm.ubuntu.com-20110901202114-g5ayj75lq9f47sch
(jelmer) Various fixes to allow tests to run against foreign branches.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
318
318
        # it is legal to attempt to pull an already-merged bundle
319
319
        out, err = self.run_bzr('pull ../bundle')
320
320
        self.assertEqual(err, '')
321
 
        self.assertEqual(out, 'No revisions or tags to pull.\n')
 
321
        self.assertEqual(out, 'No revisions to pull.\n')
322
322
 
323
323
    def test_pull_verbose_no_files(self):
324
324
        """Pull --verbose should not list modified files"""
533
533
        out = self.run_bzr(['pull','-d','to','from'],retcode=1)
534
534
        self.assertEqual(out,
535
535
            ('No revisions to pull.\nConflicting tags:\n    mytag\n', ''))
536
 
 
537
 
    def test_pull_tag_notification(self):
538
 
        """pulling tags with conflicts will change the exit code"""
539
 
        # create a branch, see that --show-base fails
540
 
        from_tree = self.make_branch_and_tree('from')
541
 
        from_tree.branch.tags.set_tag("mytag", "somerevid")
542
 
        to_tree = self.make_branch_and_tree('to')
543
 
        out = self.run_bzr(['pull', '-d', 'to', 'from'])
544
 
        self.assertEqual(out,
545
 
            ('1 tag(s) updated.\n', ''))