← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 18:09:18 UTC
  • mfrom: (6614.1.3 assert)
  • mto: This revision was merged to the branch mainline in revision 6615.
  • Revision ID: v.ladeuil+lp@free.fr-20160201180918-jqtq8ol6gdbbbtpv
Fix deprecated assertions to unblock release

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_workingtree.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#           and others
4
4
#
238
238
        tree = self.make_branch_and_tree('.')
239
239
        self.build_tree(['hello.txt'])
240
240
        tree.add('hello.txt')
241
 
        self.assertEquals(list(tree.unknowns()),
 
241
        self.assertEqual(list(tree.unknowns()),
242
242
                          [])
243
243
 
244
244
    def test_unknowns(self):
247
247
                         'hello.txt.~1~'])
248
248
        self.build_tree_contents([('.bzrignore', '*.~*\n')])
249
249
        tree.add('.bzrignore')
250
 
        self.assertEquals(list(tree.unknowns()),
 
250
        self.assertEqual(list(tree.unknowns()),
251
251
                          ['hello.txt'])
252
252
 
253
253
    def test_initialize(self):
681
681
            tree.add(['somefile'], ['file-id'])
682
682
            tree.set_merge_modified(d)
683
683
            mm = tree.merge_modified()
684
 
            self.assertEquals(mm, d)
 
684
            self.assertEqual(mm, d)
685
685
        finally:
686
686
            tree.unlock()
687
687
        mm = tree.merge_modified()
688
 
        self.assertEquals(mm, d)
 
688
        self.assertEqual(mm, d)
689
689
 
690
690
    def test_conflicts(self):
691
691
        from bzrlib.tests.test_conflicts import example_conflicts
1216
1216
        self.overrideAttr(trace, 'warning', warning)
1217
1217
        self.assertEqual(10, wt._worth_saving_limit())
1218
1218
        self.assertLength(1, warnings)
1219
 
        self.assertEquals('Value "a" is not valid for'
 
1219
        self.assertEqual('Value "a" is not valid for'
1220
1220
                          ' "bzr.workingtree.worth_saving_limit"',
1221
1221
                          warnings[0])
1222
1222