← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_update.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
90
90
Updated to revision 1 of branch %s
91
91
""" % osutils.pathjoin(self.test_dir, 'branch',),
92
92
                         err)
93
 
        self.failUnlessExists('branch/file')
 
93
        self.assertPathExists('branch/file')
94
94
 
95
95
    def test_update_out_of_date_light_checkout(self):
96
96
        self.make_branch_and_tree('branch')
179
179
""" % osutils.pathjoin(self.test_dir, 'master',),
180
180
                         err)
181
181
        self.assertEqual([master_tip, child_tip], wt.get_parent_ids())
182
 
        self.failUnlessExists('checkout/file')
183
 
        self.failUnlessExists('checkout/file_b')
184
 
        self.failUnlessExists('checkout/file_c')
 
182
        self.assertPathExists('checkout/file')
 
183
        self.assertPathExists('checkout/file_b')
 
184
        self.assertPathExists('checkout/file_c')
185
185
        self.assertTrue(wt.has_filename('file_c'))
186
186
 
187
187
    def test_update_with_merges(self):
299
299
2>All changes applied successfully.
300
300
2>Updated to revision 1 of .../master
301
301
''')
302
 
        self.failUnlessExists('./file1')
303
 
        self.failIfExists('./file2')
 
302
        self.assertPathExists('./file1')
 
303
        self.assertPathDoesNotExist('./file2')
304
304
        self.assertEquals(['m1'], master.get_parent_ids())
305
305
 
306
306
    def test_update_dash_r_outside_history(self):