← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-15 21:00:20 UTC
  • mfrom: (3113.5.1 test.174055)
  • Revision ID: pqm@pqm.ubuntu.com-20071215210020-m28kk1qmbcc9n6qs
(bialix) XFAIL test for #174055: can't run bzr info while dirstate
 is locked

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
80
80
            rt.unlock()
81
81
        # check a backup was made:
82
82
        transport = get_transport(b.base)
83
 
        transport.stat('backup.bzr')
84
 
        transport.stat('backup.bzr/README')
85
 
        transport.stat('backup.bzr/branch-format')
86
 
        transport.stat('backup.bzr/revision-history')
87
 
        transport.stat('backup.bzr/merged-patches')
88
 
        transport.stat('backup.bzr/pending-merged-patches')
89
 
        transport.stat('backup.bzr/pending-merges')
90
 
        transport.stat('backup.bzr/branch-name')
91
 
        transport.stat('backup.bzr/branch-lock')
92
 
        transport.stat('backup.bzr/inventory')
93
 
        transport.stat('backup.bzr/stat-cache')
94
 
        transport.stat('backup.bzr/text-store')
95
 
        transport.stat('backup.bzr/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
96
 
        transport.stat('backup.bzr/text-store/foo-20051004035756-4081373d897c3453.gz')
97
 
        transport.stat('backup.bzr/inventory-store/')
98
 
        transport.stat('backup.bzr/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
99
 
        transport.stat('backup.bzr/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
100
 
        transport.stat('backup.bzr/revision-store/')
101
 
        transport.stat('backup.bzr/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
102
 
        transport.stat('backup.bzr/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
83
        transport.stat('.bzr.backup')
 
84
        transport.stat('.bzr.backup/README')
 
85
        transport.stat('.bzr.backup/branch-format')
 
86
        transport.stat('.bzr.backup/revision-history')
 
87
        transport.stat('.bzr.backup/merged-patches')
 
88
        transport.stat('.bzr.backup/pending-merged-patches')
 
89
        transport.stat('.bzr.backup/pending-merges')
 
90
        transport.stat('.bzr.backup/branch-name')
 
91
        transport.stat('.bzr.backup/branch-lock')
 
92
        transport.stat('.bzr.backup/inventory')
 
93
        transport.stat('.bzr.backup/stat-cache')
 
94
        transport.stat('.bzr.backup/text-store')
 
95
        transport.stat('.bzr.backup/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
 
96
        transport.stat('.bzr.backup/text-store/foo-20051004035756-4081373d897c3453.gz')
 
97
        transport.stat('.bzr.backup/inventory-store/')
 
98
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
99
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
100
        transport.stat('.bzr.backup/revision-store/')
 
101
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
102
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
103
103
 
104
104
    def test_upgrade_with_ghosts(self):
105
105
        """Upgrade v0.0.4 tree containing ghost references.
135
135
        # 'dir-20051005095101-da1441ea3fa6917a'
136
136
        repo.lock_read()
137
137
        self.addCleanup(repo.unlock)
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)
 
138
        self.assertNotEqual(
 
139
            [],
 
140
            repo.weave_store.get_weave(
 
141
                'dir-20051005095101-da1441ea3fa6917a',
 
142
                repo.get_transaction()).versions())
142
143
 
143
144
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
144
145
        self.build_tree_contents(_upgrade_dir_template)
154
155
        upgrade('.', bzrdir.BzrDirFormat6())
155
156
        transport = get_transport('.')
156
157
        transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
157
 
        self.assertFalse(transport.has('.bzr/stat-cache'))
158
 
        # XXX: upgrade fails if a backup.bzr is already present
 
158
        assert not transport.has('.bzr/stat-cache')
 
159
        # XXX: upgrade fails if a .bzr.backup is already present
159
160
        # -- David Allouche 2006-08-11
160
 
        transport.delete_tree('backup.bzr')
 
161
        transport.delete_tree('.bzr.backup')
161
162
        # At this point, we have a format6 branch without checkout files.
162
163
        upgrade('.', bzrdir.BzrDirMetaFormat1())
163
164
        # The upgrade should not have set up a working tree.
257
258
     ('foo', 'new contents\n'),
258
259
     ('.bzr/',),
259
260
     ('.bzr/README',
260
 
      'This is a Bazaar control directory.\n'
261
 
      'Do not change any files in this directory.\n'
262
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
 
261
      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
263
262
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
264
263
     ('.bzr/revision-history',
265
264
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
299
298
    ),
300
299
    ( './.bzr/', ),
301
300
    ( './.bzr/README',
302
 
      'This is a Bazaar control directory.\n'
303
 
      'Do not change any files in this directory.\n'
304
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
 
301
        'This is a Bazaar-NG control directory.\n'
 
302
        'Do not change any files in this directory.\n'
305
303
    ),
306
304
    ( './.bzr/branch-format',
307
305
        'Bazaar-NG branch, format 0.0.4\n'
365
363
_upgrade_dir_template = [
366
364
    ( './.bzr/', ),
367
365
    ( './.bzr/README',
368
 
      'This is a Bazaar control directory.\n'
369
 
      'Do not change any files in this directory.\n'
370
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
 
366
        'This is a Bazaar-NG control directory.\n'
 
367
        'Do not change any files in this directory.\n'
371
368
    ),
372
369
    ( './.bzr/branch-format',
373
370
        'Bazaar-NG branch, format 0.0.4\n'