← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

  • Committer: John Arbash Meinel
  • Date: 2012-09-14 07:22:49 UTC
  • mfrom: (6015.57.3 2.4)
  • mto: (6015.57.7 2.4)
  • mto: This revision was merged to the branch mainline in revision 6579.
  • Revision ID: john@arbash-meinel.com-20120914072249-rvpderuqqme7sy88
Merge bzr/2.4 (6072) into client-reconnect code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_merger.py
175
175
        transform.finalize()
176
176
        return (limbodir, deletiondir)
177
177
 
178
 
    def test_merge_with_existing_limbo(self):
179
 
        wt = self.make_branch_and_tree('this')
180
 
        (limbodir, deletiondir) =  self.get_limbodir_deletiondir(wt)
181
 
        os.mkdir(limbodir)
 
178
    def test_merge_with_existing_limbo_empty(self):
 
179
        """Empty limbo dir is just cleaned up - see bug 427773"""
 
180
        wt = self.make_branch_and_tree('this')
 
181
        (limbodir, deletiondir) =  self.get_limbodir_deletiondir(wt)
 
182
        os.mkdir(limbodir)
 
183
        self.do_merge(wt, wt)
 
184
 
 
185
    def test_merge_with_existing_limbo_non_empty(self):
 
186
        wt = self.make_branch_and_tree('this')
 
187
        (limbodir, deletiondir) =  self.get_limbodir_deletiondir(wt)
 
188
        os.mkdir(limbodir)
 
189
        os.mkdir(os.path.join(limbodir, 'something'))
182
190
        self.assertRaises(errors.ExistingLimbo, self.do_merge, wt, wt)
183
191
        self.assertRaises(errors.LockError, wt.unlock)
184
192
 
185
 
    def test_merge_with_pending_deletion(self):
186
 
        wt = self.make_branch_and_tree('this')
187
 
        (limbodir, deletiondir) =  self.get_limbodir_deletiondir(wt)
188
 
        os.mkdir(deletiondir)
 
193
    def test_merge_with_pending_deletion_empty(self):
 
194
        wt = self.make_branch_and_tree('this')
 
195
        (limbodir, deletiondir) =  self.get_limbodir_deletiondir(wt)
 
196
        os.mkdir(deletiondir)
 
197
        self.do_merge(wt, wt)
 
198
 
 
199
    def test_merge_with_pending_deletion_non_empty(self):
 
200
        """Also see bug 427773"""
 
201
        wt = self.make_branch_and_tree('this')
 
202
        (limbodir, deletiondir) =  self.get_limbodir_deletiondir(wt)
 
203
        os.mkdir(deletiondir)
 
204
        os.mkdir(os.path.join(deletiondir, 'something'))
189
205
        self.assertRaises(errors.ExistingPendingDeletion, self.do_merge, wt, wt)
190
206
        self.assertRaises(errors.LockError, wt.unlock)
191
207