← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_timestamp.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 18:06:32 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-20160201180632-xgp7k7z5bda9ap1w
Fix assertEquals being deprecated by using assertEqual.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_timestamp.py
1
 
# Copyright (C) 2007, 2009, 2011 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2010, 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
102
102
class UnpackHighresDateTests(tests.TestCase):
103
103
 
104
104
    def test_unpack_highres_date(self):
105
 
        self.assertEquals(
 
105
        self.assertEqual(
106
106
            (1120153132.3508501, -18000),
107
107
            timestamp.unpack_highres_date('Thu 2005-06-30 12:38:52.350850105 -0500'))
108
 
        self.assertEquals(
 
108
        self.assertEqual(
109
109
            (1120153132.3508501, 0),
110
110
            timestamp.unpack_highres_date('Thu 2005-06-30 17:38:52.350850105 +0000'))
111
 
        self.assertEquals(
 
111
        self.assertEqual(
112
112
            (1120153132.3508501, 7200),
113
113
            timestamp.unpack_highres_date('Thu 2005-06-30 19:38:52.350850105 +0200'))
114
 
        self.assertEquals(
 
114
        self.assertEqual(
115
115
            (1152428738.867522, 19800),
116
116
            timestamp.unpack_highres_date('Sun 2006-07-09 12:35:38.867522001 +0530'))
117
117
 
119
119
        t = time.time()
120
120
        o = local_time_offset()
121
121
        t2, o2 = timestamp.unpack_highres_date(timestamp.format_highres_date(t, o))
122
 
        self.assertEquals(t, t2)
123
 
        self.assertEquals(o, o2)
 
122
        self.assertEqual(t, t2)
 
123
        self.assertEqual(o, o2)
124
124
        t -= 24*3600*365*2 # Start 2 years ago
125
125
        o = -12*3600
126
126
        for count in xrange(500):
128
128
            o = ((o/3600 + 13) % 25 - 12)*3600 # Add 1 wrap around from [-12, 12]
129
129
            date = timestamp.format_highres_date(t, o)
130
130
            t2, o2 = timestamp.unpack_highres_date(date)
131
 
            self.assertEquals(t, t2,
 
131
            self.assertEqual(t, t2,
132
132
                'Failed on date %r, %s,%s diff:%s' % (date, t, o, t2-t))
133
 
            self.assertEquals(o, o2,
 
133
            self.assertEqual(o, o2,
134
134
                'Failed on date %r, %s,%s diff:%s' % (date, t, o, t2-t))