← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_branch.py

  • Committer: Aaron Bentley
  • Date: 2012-07-19 16:10:38 UTC
  • mto: This revision was merged to the branch mainline in revision 6540.
  • Revision ID: aaron@aaronbentley.com-20120719161038-fuaze292nvg2unfv
Remove _put_uncommitted method.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_branch.py
1069
1069
 
1070
1070
class TestUncommittedChanges(per_branch.TestCaseWithBranch):
1071
1071
 
1072
 
    def test_get_put_uncommitted(self):
1073
 
        branch = self.make_branch('branch')
1074
 
        self.assertIs(None, branch._get_uncommitted())
1075
 
        branch._put_uncommitted(StringIO('Hello'))
1076
 
        self.assertEqual('Hello', branch._get_uncommitted().read())
1077
 
 
1078
 
    def test_uncommitted_none(self):
1079
 
        branch = self.make_branch('branch')
1080
 
        branch._put_uncommitted(StringIO('Hello'))
1081
 
        branch._put_uncommitted(None)
1082
 
        self.assertIs(None, branch._get_uncommitted())
1083
 
        # Setting uncommitted to None when it is already None is not an error.
1084
 
        branch._put_uncommitted(None)
1085
 
 
1086
1072
    def bind(self, branch, master):
1087
1073
        try:
1088
1074
            branch.bind(master)
1112
1098
 
1113
1099
    def test_store_uncommitted_already_stored(self):
1114
1100
        branch = self.make_branch('b')
1115
 
        branch._put_uncommitted(StringIO('hello'))
 
1101
        branch.store_uncommitted(FakeShelfCreator())
1116
1102
        self.assertRaises(errors.ChangesAlreadyStored,
1117
1103
                          branch.store_uncommitted, FakeShelfCreator())
1118
1104
 
1119
1105
    def test_store_uncommitted_none(self):
1120
1106
        branch = self.make_branch('b')
1121
 
        branch._put_uncommitted(StringIO('hello'))
 
1107
        branch.store_uncommitted(FakeShelfCreator())
1122
1108
        branch.store_uncommitted(None)
1123
1109
        self.assertIs(None, branch.get_unshelver(None))
1124
1110