/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_upgrade.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-08 14:55:19 UTC
  • mfrom: (3530 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3532.
  • Revision ID: john@arbash-meinel.com-20080708145519-paqg4kjwbpgs2xmq
Merge bzr.dev 3530

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
135
135
        # 'dir-20051005095101-da1441ea3fa6917a'
136
136
        repo.lock_read()
137
137
        self.addCleanup(repo.unlock)
138
 
        self.assertNotEqual(
139
 
            [],
140
 
            repo.weave_store.get_weave(
141
 
                'dir-20051005095101-da1441ea3fa6917a',
142
 
                repo.get_transaction()).versions())
 
138
        text_keys = repo.texts.keys()
 
139
        dir_keys = [key for key in text_keys if key[0] ==
 
140
                'dir-20051005095101-da1441ea3fa6917a']
 
141
        self.assertNotEqual([], dir_keys)
143
142
 
144
143
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
145
144
        self.build_tree_contents(_upgrade_dir_template)
155
154
        upgrade('.', bzrdir.BzrDirFormat6())
156
155
        transport = get_transport('.')
157
156
        transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
158
 
        assert not transport.has('.bzr/stat-cache')
 
157
        self.assertFalse(transport.has('.bzr/stat-cache'))
159
158
        # XXX: upgrade fails if a backup.bzr is already present
160
159
        # -- David Allouche 2006-08-11
161
160
        transport.delete_tree('backup.bzr')