← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_win32utils.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/test_win32utils.py
1
 
# Copyright (C) 2007-2011 Canonical Ltd
 
1
# Copyright (C) 2007-2011, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
169
169
        for a in ('iexplore', 'iexplore.exe'):
170
170
            p = get_app_path(a)
171
171
            d, b = os.path.split(p)
172
 
            self.assertEquals('iexplore.exe', b.lower())
173
 
            self.assertNotEquals('', d)
 
172
            self.assertEqual('iexplore.exe', b.lower())
 
173
            self.assertNotEqual('', d)
174
174
 
175
175
    def test_wordpad(self):
176
176
        # typical windows users should have wordpad in the system
180
180
        for a in ('wordpad', 'wordpad.exe'):
181
181
            p = get_app_path(a)
182
182
            d, b = os.path.split(p)
183
 
            self.assertEquals('wordpad.exe', b.lower())
184
 
            self.assertNotEquals('', d)
 
183
            self.assertEqual('wordpad.exe', b.lower())
 
184
            self.assertNotEqual('', d)
185
185
 
186
186
    def test_not_existing(self):
187
187
        p = get_app_path('not-existing')
188
 
        self.assertEquals('not-existing', p)
 
188
        self.assertEqual('not-existing', p)
189
189
 
190
190
 
191
191
class TestLocations(TestCase):
242
242
        # version (ie, "C:\DOCUME~1\...").  Its even possible the returned
243
243
        # values will differ only by case - handle these situations as we
244
244
        # come across them.
245
 
        self.assertEquals(p1, p2)
 
245
        self.assertEqual(p1, p2)
246
246
 
247
247
    def test_appdata_not_using_environment(self):
248
248
        # Test that we aren't falling back to the environment