~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

  • Committer: Aaron Bentley
  • Date: 2012-07-12 19:11:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6540.
  • Revision ID: aaron@aaronbentley.com-20120712191154-3fniuw24jlnat2nw
Migrate tests to per_branch, support RemoteBranch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
724
724
        self.assertEqual("No revisions or tags to pull.\n", f.getvalue())
725
725
 
726
726
 
727
 
class TestUncommittedChanges(tests.TestCaseWithTransport):
728
 
 
729
 
    def test_get_put_uncommitted(self):
730
 
        branch = self.make_branch('branch')
731
 
        self.assertIs(None, branch._get_uncommitted())
732
 
        branch._put_uncommitted(StringIO('Hello'))
733
 
        self.assertEqual('Hello', branch._get_uncommitted().read())
734
 
 
735
 
    def test_uncommitted_none(self):
736
 
        branch = self.make_branch('branch')
737
 
        branch._put_uncommitted(StringIO('Hello'))
738
 
        branch._put_uncommitted(None)
739
 
        self.assertIs(None, branch._get_uncommitted())
740
 
        # Setting uncommitted to None when it is already None is not an error.
741
 
        branch._put_uncommitted(None)