← 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: Alexander Belchenko
  • Date: 2008-02-06 15:33:12 UTC
  • mto: This revision was merged to the branch mainline in revision 3231.
  • Revision ID: bialix@ukr.net-20080206153312-qycs7u05d7fjtwqq
Ian's review

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.
156
156
        transport = get_transport('.')
157
157
        transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
158
158
        assert not transport.has('.bzr/stat-cache')
159
 
        # XXX: upgrade fails if a backup.bzr is already present
 
159
        # XXX: upgrade fails if a .bzr.backup is already present
160
160
        # -- David Allouche 2006-08-11
161
 
        transport.delete_tree('backup.bzr')
 
161
        transport.delete_tree('.bzr.backup')
162
162
        # At this point, we have a format6 branch without checkout files.
163
163
        upgrade('.', bzrdir.BzrDirMetaFormat1())
164
164
        # The upgrade should not have set up a working tree.
258
258
     ('foo', 'new contents\n'),
259
259
     ('.bzr/',),
260
260
     ('.bzr/README',
261
 
      'This is a Bazaar control directory.\n'
262
 
      'Do not change any files in this directory.\n'
263
 
      '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'),
264
262
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
265
263
     ('.bzr/revision-history',
266
264
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
300
298
    ),
301
299
    ( './.bzr/', ),
302
300
    ( './.bzr/README',
303
 
      'This is a Bazaar control directory.\n'
304
 
      'Do not change any files in this directory.\n'
305
 
      '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'
306
303
    ),
307
304
    ( './.bzr/branch-format',
308
305
        'Bazaar-NG branch, format 0.0.4\n'
366
363
_upgrade_dir_template = [
367
364
    ( './.bzr/', ),
368
365
    ( './.bzr/README',
369
 
      'This is a Bazaar control directory.\n'
370
 
      'Do not change any files in this directory.\n'
371
 
      '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'
372
368
    ),
373
369
    ( './.bzr/branch-format',
374
370
        'Bazaar-NG branch, format 0.0.4\n'