/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2006-06-27 08:47:32 UTC
  • mto: (1711.2.66 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1819.
  • Revision ID: jelmer@samba.org-20060627084732-3c3fdc02e5bea94e
Move missing_pending_merges test to WorkingTreeFormat3-specific tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
202
202
        tree.unlock()
203
203
        self.assertEquals(our_lock.peek(), None)
204
204
 
 
205
    def test_missing_pending_merges(self):
 
206
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
 
207
        control.create_repository()
 
208
        control.create_branch()
 
209
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
210
        tree._control_files._transport.delete("pending-merges")
 
211
        self.assertEqual([], tree.pending_merges())
 
212
 
205
213
 
206
214
class TestFormat2WorkingTree(TestCaseWithTransport):
207
215
    """Tests that are specific to format 2 trees."""