← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_osutils.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 16:50:54 UTC
  • mto: (6614.2.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6615.
  • Revision ID: v.ladeuil+lp@free.fr-20160201165054-ihgm2jt16ire1sye
Fix assert_ being deprecated by using assertTrue.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils.py
1
 
# Copyright (C) 2005-2015 Canonical Ltd
 
1
# Copyright (C) 2005-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
222
222
                         (['src'], SRC_FOO_C),
223
223
                         (['src'], 'src'),
224
224
                         ]:
225
 
            self.assert_(osutils.is_inside_any(dirs, fn))
 
225
            self.assertTrue(osutils.is_inside_any(dirs, fn))
226
226
        for dirs, fn in [(['src'], 'srccontrol'),
227
227
                         (['src'], 'srccontrol/foo')]:
228
228
            self.assertFalse(osutils.is_inside_any(dirs, fn))
234
234
                         (['src/bar.c', 'bla/foo.c'], 'src'),
235
235
                         (['src'], 'src'),
236
236
                         ]:
237
 
            self.assert_(osutils.is_inside_or_parent_of_any(dirs, fn))
 
237
            self.assertTrue(osutils.is_inside_or_parent_of_any(dirs, fn))
238
238
 
239
239
        for dirs, fn in [(['src'], 'srccontrol'),
240
240
                         (['srccontrol/foo.c'], 'src'),