Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r73651:4ec1f9c52a23
Date: 2014-09-22 17:41 -0400
http://bitbucket.org/pypy/pypy/changeset/4ec1f9c52a23/
Log: test datetime against both host and lib_pypy
diff --git a/pypy/module/test_lib_pypy/test_datetime.py
b/pypy/module/test_lib_pypy/test_datetime.py
--- a/pypy/module/test_lib_pypy/test_datetime.py
+++ b/pypy/module/test_lib_pypy/test_datetime.py
@@ -1,211 +1,221 @@
"""Additional tests for datetime."""
from __future__ import absolute_import
-from lib_pypy import datetime
import py
-def test_repr():
- print datetime
- expected = "datetime.datetime(1, 2, 3, 0, 0)"
- assert repr(datetime.datetime(1,2,3)) == expected
+class BaseTestDatetime:
+ def test_repr(self):
+ print datetime
+ expected = "datetime.datetime(1, 2, 3, 0, 0)"
+ assert repr(datetime.datetime(1,2,3)) == expected
-def test_attributes():
- for x in [datetime.date.today(),
- datetime.time(),
- datetime.datetime.utcnow(),
- datetime.timedelta(),
- datetime.tzinfo()]:
- raises(AttributeError, 'x.abc = 1')
+ def test_attributes(self):
+ for x in [datetime.date.today(),
+ datetime.time(),
+ datetime.datetime.utcnow(),
+ datetime.timedelta(),
+ datetime.tzinfo()]:
+ raises(AttributeError, 'x.abc = 1')
-def test_timedelta_init_long():
- td = datetime.timedelta(microseconds=20000000000000000000)
- assert td.days == 231481481
- assert td.seconds == 41600
- td = datetime.timedelta(microseconds=20000000000000000000.)
- assert td.days == 231481481
- assert td.seconds == 41600
+ def test_timedelta_init_long(self):
+ td = datetime.timedelta(microseconds=20000000000000000000)
+ assert td.days == 231481481
+ assert td.seconds == 41600
+ td = datetime.timedelta(microseconds=20000000000000000000.)
+ assert td.days == 231481481
+ assert td.seconds == 41600
-def test_unpickle():
- e = raises(TypeError, datetime.date, '123')
- assert e.value.args[0] == 'an integer is required'
- e = raises(TypeError, datetime.time, '123')
- assert e.value.args[0] == 'an integer is required'
- e = raises(TypeError, datetime.datetime, '123')
- assert e.value.args[0] == 'an integer is required'
+ def test_unpickle(self):
+ e = raises(TypeError, datetime.date, '123')
+ assert e.value.args[0] == 'an integer is required'
+ e = raises(TypeError, datetime.time, '123')
+ assert e.value.args[0] == 'an integer is required'
+ e = raises(TypeError, datetime.datetime, '123')
+ assert e.value.args[0] == 'an integer is required'
- datetime.time('\x01' * 6, None)
- with raises(TypeError) as e:
- datetime.time('\x01' * 6, 123)
- assert str(e.value) == "bad tzinfo state arg"
+ datetime.time('\x01' * 6, None)
+ with raises(TypeError) as e:
+ datetime.time('\x01' * 6, 123)
+ assert str(e.value) == "bad tzinfo state arg"
- datetime.datetime('\x01' * 10, None)
- with raises(TypeError) as e:
- datetime.datetime('\x01' * 10, 123)
- assert str(e.value) == "bad tzinfo state arg"
+ datetime.datetime('\x01' * 10, None)
+ with raises(TypeError) as e:
+ datetime.datetime('\x01' * 10, 123)
+ assert str(e.value) == "bad tzinfo state arg"
-def test_strptime():
- import time, sys
- if sys.version_info < (2, 6):
- py.test.skip("needs the _strptime module")
+ def test_strptime(self):
+ import time, sys
+ if sys.version_info < (2, 6):
+ py.test.skip("needs the _strptime module")
- string = '2004-12-01 13:02:47'
- format = '%Y-%m-%d %H:%M:%S'
- expected = datetime.datetime(*(time.strptime(string, format)[0:6]))
- got = datetime.datetime.strptime(string, format)
- assert expected == got
+ string = '2004-12-01 13:02:47'
+ format = '%Y-%m-%d %H:%M:%S'
+ expected = datetime.datetime(*(time.strptime(string, format)[0:6]))
+ got = datetime.datetime.strptime(string, format)
+ assert expected == got
-def test_datetime_rounding():
- b = 0.0000001
- a = 0.9999994
+ def test_datetime_rounding(self):
+ b = 0.0000001
+ a = 0.9999994
- assert datetime.datetime.utcfromtimestamp(a).microsecond == 999999
- assert datetime.datetime.utcfromtimestamp(a).second == 0
- a += b
- assert datetime.datetime.utcfromtimestamp(a).microsecond == 999999
- assert datetime.datetime.utcfromtimestamp(a).second == 0
- a += b
- assert datetime.datetime.utcfromtimestamp(a).microsecond == 0
- assert datetime.datetime.utcfromtimestamp(a).second == 1
+ assert datetime.datetime.utcfromtimestamp(a).microsecond == 999999
+ assert datetime.datetime.utcfromtimestamp(a).second == 0
+ a += b
+ assert datetime.datetime.utcfromtimestamp(a).microsecond == 999999
+ assert datetime.datetime.utcfromtimestamp(a).second == 0
+ a += b
+ assert datetime.datetime.utcfromtimestamp(a).microsecond == 0
+ assert datetime.datetime.utcfromtimestamp(a).second == 1
-def test_more_datetime_rounding():
- # this test verified on top of CPython 2.7 (using a plain
- # "import datetime" above)
- expected_results = {
- -1000.0: 'datetime.datetime(1969, 12, 31, 23, 43, 20)',
- -999.9999996: 'datetime.datetime(1969, 12, 31, 23, 43, 20)',
- -999.4: 'datetime.datetime(1969, 12, 31, 23, 43, 20, 600000)',
- -999.0000004: 'datetime.datetime(1969, 12, 31, 23, 43, 21)',
- -1.0: 'datetime.datetime(1969, 12, 31, 23, 59, 59)',
- -0.9999996: 'datetime.datetime(1969, 12, 31, 23, 59, 59)',
- -0.4: 'datetime.datetime(1969, 12, 31, 23, 59, 59, 600000)',
- -0.0000004: 'datetime.datetime(1970, 1, 1, 0, 0)',
- 0.0: 'datetime.datetime(1970, 1, 1, 0, 0)',
- 0.0000004: 'datetime.datetime(1970, 1, 1, 0, 0)',
- 0.4: 'datetime.datetime(1970, 1, 1, 0, 0, 0, 400000)',
- 0.9999996: 'datetime.datetime(1970, 1, 1, 0, 0, 1)',
- 1000.0: 'datetime.datetime(1970, 1, 1, 0, 16, 40)',
- 1000.0000004: 'datetime.datetime(1970, 1, 1, 0, 16, 40)',
- 1000.4: 'datetime.datetime(1970, 1, 1, 0, 16, 40, 400000)',
- 1000.9999996: 'datetime.datetime(1970, 1, 1, 0, 16, 41)',
- 1293843661.191: 'datetime.datetime(2011, 1, 1, 1, 1, 1, 191000)',
- }
- for t in sorted(expected_results):
- dt = datetime.datetime.utcfromtimestamp(t)
- assert repr(dt) == expected_results[t]
+ def test_more_datetime_rounding(self):
+ # this test verified on top of CPython 2.7 (using a plain
+ # "import datetime" above)
+ expected_results = {
+ -1000.0: 'datetime.datetime(1969, 12, 31, 23, 43, 20)',
+ -999.9999996: 'datetime.datetime(1969, 12, 31, 23, 43, 20)',
+ -999.4: 'datetime.datetime(1969, 12, 31, 23, 43, 20, 600000)',
+ -999.0000004: 'datetime.datetime(1969, 12, 31, 23, 43, 21)',
+ -1.0: 'datetime.datetime(1969, 12, 31, 23, 59, 59)',
+ -0.9999996: 'datetime.datetime(1969, 12, 31, 23, 59, 59)',
+ -0.4: 'datetime.datetime(1969, 12, 31, 23, 59, 59, 600000)',
+ -0.0000004: 'datetime.datetime(1970, 1, 1, 0, 0)',
+ 0.0: 'datetime.datetime(1970, 1, 1, 0, 0)',
+ 0.0000004: 'datetime.datetime(1970, 1, 1, 0, 0)',
+ 0.4: 'datetime.datetime(1970, 1, 1, 0, 0, 0, 400000)',
+ 0.9999996: 'datetime.datetime(1970, 1, 1, 0, 0, 1)',
+ 1000.0: 'datetime.datetime(1970, 1, 1, 0, 16, 40)',
+ 1000.0000004: 'datetime.datetime(1970, 1, 1, 0, 16, 40)',
+ 1000.4: 'datetime.datetime(1970, 1, 1, 0, 16, 40, 400000)',
+ 1000.9999996: 'datetime.datetime(1970, 1, 1, 0, 16, 41)',
+ 1293843661.191: 'datetime.datetime(2011, 1, 1, 1, 1, 1, 191000)',
+ }
+ for t in sorted(expected_results):
+ dt = datetime.datetime.utcfromtimestamp(t)
+ assert repr(dt) == expected_results[t]
-def test_utcfromtimestamp():
- """Confirm that utcfromtimestamp and fromtimestamp give consistent results.
+ def test_utcfromtimestamp(self):
+ """Confirm that utcfromtimestamp and fromtimestamp give consistent
results.
- Based on danchr's test script in https://bugs.pypy.org/issue986
- """
- import os
- import time
- if os.name == 'nt':
- skip("setting os.environ['TZ'] ineffective on windows")
- try:
- prev_tz = os.environ.get("TZ")
- os.environ["TZ"] = "GMT"
- time.tzset()
- for unused in xrange(100):
- now = time.time()
- delta = (datetime.datetime.utcfromtimestamp(now) -
- datetime.datetime.fromtimestamp(now))
- assert delta.days * 86400 + delta.seconds == 0
- finally:
- if prev_tz is None:
- del os.environ["TZ"]
- else:
- os.environ["TZ"] = prev_tz
- time.tzset()
+ Based on danchr's test script in https://bugs.pypy.org/issue986
+ """
+ import os
+ import time
+ if os.name == 'nt':
+ skip("setting os.environ['TZ'] ineffective on windows")
+ try:
+ prev_tz = os.environ.get("TZ")
+ os.environ["TZ"] = "GMT"
+ time.tzset()
+ for unused in xrange(100):
+ now = time.time()
+ delta = (datetime.datetime.utcfromtimestamp(now) -
+ datetime.datetime.fromtimestamp(now))
+ assert delta.days * 86400 + delta.seconds == 0
+ finally:
+ if prev_tz is None:
+ del os.environ["TZ"]
+ else:
+ os.environ["TZ"] = prev_tz
+ time.tzset()
-def test_utcfromtimestamp_microsecond():
- dt = datetime.datetime.utcfromtimestamp(0)
- assert isinstance(dt.microsecond, int)
+ def test_utcfromtimestamp_microsecond(self):
+ dt = datetime.datetime.utcfromtimestamp(0)
+ assert isinstance(dt.microsecond, int)
-def test_default_args():
- with py.test.raises(TypeError):
- datetime.datetime()
- with py.test.raises(TypeError):
- datetime.datetime(10)
- with py.test.raises(TypeError):
- datetime.datetime(10, 10)
- datetime.datetime(10, 10, 10)
+ def test_default_args(self):
+ with py.test.raises(TypeError):
+ datetime.datetime()
+ with py.test.raises(TypeError):
+ datetime.datetime(10)
+ with py.test.raises(TypeError):
+ datetime.datetime(10, 10)
+ datetime.datetime(10, 10, 10)
-def test_check_arg_types():
- import decimal
- class Number:
- def __init__(self, value):
- self.value = value
- def __int__(self):
- return self.value
+ def test_check_arg_types(self):
+ import decimal
+ class Number:
+ def __init__(self, value):
+ self.value = value
+ def __int__(self):
+ return self.value
- for xx in [10L,
- decimal.Decimal(10),
- decimal.Decimal('10.9'),
- Number(10),
- Number(10L)]:
- assert datetime.datetime(10, 10, 10, 10, 10, 10, 10) == \
- datetime.datetime(xx, xx, xx, xx, xx, xx, xx)
+ for xx in [10L,
+ decimal.Decimal(10),
+ decimal.Decimal('10.9'),
+ Number(10),
+ Number(10L)]:
+ assert datetime.datetime(10, 10, 10, 10, 10, 10, 10) == \
+ datetime.datetime(xx, xx, xx, xx, xx, xx, xx)
- with py.test.raises(TypeError) as e:
- datetime.datetime(10, 10, '10')
- assert str(e.value) == 'an integer is required'
+ with py.test.raises(TypeError) as e:
+ datetime.datetime(10, 10, '10')
+ assert str(e.value) == 'an integer is required'
- f10 = Number(10.9)
- with py.test.raises(TypeError) as e:
- datetime.datetime(10, 10, f10)
- assert str(e.value) == '__int__ method should return an integer'
+ f10 = Number(10.9)
+ with py.test.raises(TypeError) as e:
+ datetime.datetime(10, 10, f10)
+ assert str(e.value) == '__int__ method should return an integer'
- class Float(float):
- pass
- s10 = Float(10.9)
- with py.test.raises(TypeError) as e:
- datetime.datetime(10, 10, s10)
- assert str(e.value) == 'integer argument expected, got float'
+ class Float(float):
+ pass
+ s10 = Float(10.9)
+ with py.test.raises(TypeError) as e:
+ datetime.datetime(10, 10, s10)
+ assert str(e.value) == 'integer argument expected, got float'
- with py.test.raises(TypeError):
- datetime.datetime(10., 10, 10)
- with py.test.raises(TypeError):
- datetime.datetime(10, 10., 10)
- with py.test.raises(TypeError):
- datetime.datetime(10, 10, 10.)
- with py.test.raises(TypeError):
- datetime.datetime(10, 10, 10, 10.)
- with py.test.raises(TypeError):
- datetime.datetime(10, 10, 10, 10, 10.)
- with py.test.raises(TypeError):
- datetime.datetime(10, 10, 10, 10, 10, 10.)
- with py.test.raises(TypeError):
- datetime.datetime(10, 10, 10, 10, 10, 10, 10.)
+ with py.test.raises(TypeError):
+ datetime.datetime(10., 10, 10)
+ with py.test.raises(TypeError):
+ datetime.datetime(10, 10., 10)
+ with py.test.raises(TypeError):
+ datetime.datetime(10, 10, 10.)
+ with py.test.raises(TypeError):
+ datetime.datetime(10, 10, 10, 10.)
+ with py.test.raises(TypeError):
+ datetime.datetime(10, 10, 10, 10, 10.)
+ with py.test.raises(TypeError):
+ datetime.datetime(10, 10, 10, 10, 10, 10.)
+ with py.test.raises(TypeError):
+ datetime.datetime(10, 10, 10, 10, 10, 10, 10.)
-def test_utcnow_microsecond():
- import copy
+ def test_utcnow_microsecond(self):
+ import copy
- dt = datetime.datetime.utcnow()
- assert type(dt.microsecond) is int
+ dt = datetime.datetime.utcnow()
+ assert type(dt.microsecond) is int
- copy.copy(dt)
+ copy.copy(dt)
-def test_radd():
- class X(object):
- def __radd__(self, other):
- return "radd"
- assert datetime.date(10, 10, 10) + X() == "radd"
+ def test_radd(self):
+ class X(object):
+ def __radd__(self, other):
+ return "radd"
+ assert datetime.date(10, 10, 10) + X() == "radd"
-def test_raises_if_passed_naive_datetime_and_start_or_end_time_defined():
- class Foo(datetime.tzinfo):
- def utcoffset(self, dt):
- return datetime.timedelta(0.1)
- naive = datetime.datetime(2014, 9, 22)
- aware = datetime.datetime(2014, 9, 22, tzinfo=Foo())
- with py.test.raises(TypeError) as e:
- naive == aware
- assert str(e.value) == "can't compare offset-naive and offset-aware
datetimes"
- with py.test.raises(TypeError) as e:
- naive - aware
- assert str(e.value) == "can't subtract offset-naive and offset-aware
datetimes"
- naive = datetime.time(7, 32, 12)
- aware = datetime.time(7, 32, 12, tzinfo=Foo())
- with py.test.raises(TypeError) as e:
- naive == aware
- assert str(e.value) == "can't compare offset-naive and offset-aware times"
+ def
test_raises_if_passed_naive_datetime_and_start_or_end_time_defined(self):
+ class Foo(datetime.tzinfo):
+ def utcoffset(self, dt):
+ return datetime.timedelta(0.1)
+ naive = datetime.datetime(2014, 9, 22)
+ aware = datetime.datetime(2014, 9, 22, tzinfo=Foo())
+ with py.test.raises(TypeError) as e:
+ naive == aware
+ assert str(e.value) == "can't compare offset-naive and offset-aware
datetimes"
+ with py.test.raises(TypeError) as e:
+ naive - aware
+ assert str(e.value) == "can't subtract offset-naive and offset-aware
datetimes"
+ naive = datetime.time(7, 32, 12)
+ aware = datetime.time(7, 32, 12, tzinfo=Foo())
+ with py.test.raises(TypeError) as e:
+ naive == aware
+ assert str(e.value) == "can't compare offset-naive and offset-aware
times"
+
+class TestDatetimeCPython(BaseTestDatetime):
+ def setup_class(cls):
+ global datetime
+ import datetime
+
+class TestDatetimePyPy(BaseTestDatetime):
+ def setup_class(cls):
+ global datetime
+ from lib_pypy import datetime
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
