/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: Jelmer Vernooij
  • Date: 2011-04-16 15:01:57 UTC
  • mfrom: (5791 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5800.
  • Revision ID: jelmer@samba.org-20110416150157-5rgye9nnc8tic098
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
109
109
        self.assertEqual(rev_id, new_tree.last_revision())
110
110
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
111
111
            'pending-merges', 'stat-cache']:
112
 
            self.failIfExists('tree/.bzr/checkout/' + path)
 
112
            self.assertPathDoesNotExist('tree/.bzr/checkout/' + path)
113
113
 
114
114
    def test_convert_knit_merges_dirstate(self):
115
115
        tree = self.make_branch_and_tree('tree', format='knit')
127
127
        self.assertEqual([rev_id2, rev_id3], new_tree.get_parent_ids())
128
128
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
129
129
            'pending-merges', 'stat-cache']:
130
 
            self.failIfExists('tree/.bzr/checkout/' + path)
 
130
            self.assertPathDoesNotExist('tree/.bzr/checkout/' + path)
131
131
 
132
132
 
133
133
class TestSmartUpgrade(tests.TestCaseWithTransport):
148
148
        self.assertLength(1, worked)
149
149
        self.assertEqual(worked[0], control)
150
150
        self.assertLength(0, issues)
151
 
        self.failUnlessExists('branch1/backup.bzr.~1~')
 
151
        self.assertPathExists('branch1/backup.bzr.~1~')
152
152
        self.assertEqual(control.open_repository()._format,
153
153
                         self.to_format._repository_format)
154
154
 
161
161
        self.assertLength(1, worked)
162
162
        self.assertEqual(worked[0], control)
163
163
        self.assertLength(0, issues)
164
 
        self.failUnlessExists('branch1')
165
 
        self.failUnlessExists('branch1/.bzr')
166
 
        self.failIfExists('branch1/backup.bzr.~1~')
 
164
        self.assertPathExists('branch1')
 
165
        self.assertPathExists('branch1/.bzr')
 
166
        self.assertPathDoesNotExist('branch1/backup.bzr.~1~')
167
167
        self.assertEqual(control.open_repository()._format,
168
168
                         self.to_format._repository_format)
169
169
 
187
187
        self.assertLength(3, worked)
188
188
        self.assertEqual(worked[0], control)
189
189
        self.assertLength(0, issues)
190
 
        self.failUnlessExists('repo/backup.bzr.~1~')
191
 
        self.failUnlessExists('repo/branch1/backup.bzr.~1~')
192
 
        self.failUnlessExists('repo/branch2/backup.bzr.~1~')
 
190
        self.assertPathExists('repo/backup.bzr.~1~')
 
191
        self.assertPathExists('repo/branch1/backup.bzr.~1~')
 
192
        self.assertPathExists('repo/branch2/backup.bzr.~1~')
193
193
        self.assertEqual(control.open_repository()._format,
194
194
                         self.to_format._repository_format)
195
195
        b1 = branch.Branch.open('repo/branch1')
204
204
        self.assertLength(3, worked)
205
205
        self.assertEqual(worked[0], control)
206
206
        self.assertLength(0, issues)
207
 
        self.failUnlessExists('repo')
208
 
        self.failUnlessExists('repo/.bzr')
209
 
        self.failIfExists('repo/backup.bzr.~1~')
210
 
        self.failIfExists('repo/branch1/backup.bzr.~1~')
211
 
        self.failIfExists('repo/branch2/backup.bzr.~1~')
 
207
        self.assertPathExists('repo')
 
208
        self.assertPathExists('repo/.bzr')
 
209
        self.assertPathDoesNotExist('repo/backup.bzr.~1~')
 
210
        self.assertPathDoesNotExist('repo/branch1/backup.bzr.~1~')
 
211
        self.assertPathDoesNotExist('repo/branch2/backup.bzr.~1~')
212
212
        self.assertEqual(control.open_repository()._format,
213
213
                         self.to_format._repository_format)
214
214
        b1 = branch.Branch.open('repo/branch1')