get current tests passing

Author: patrickmckenna

pandas/tests/scalar/conftest.py

@@ -0,0 +1,6 @@
+import pytest
+
+
+@pytest.fixture(name="td_overflow_msg")
+def fixture_td_overflow_msg() -> str:
+ return R"outside allowed range \[-9223372036854775807ns, 9223372036854775807ns\]"

pandas/tests/scalar/timedelta/test_arithmetic.py

@@ -98,12 +98,11 @@ def test_td_add_datetimelike_scalar(self, op):
  result = op(td, NaT)
  assert result is NaT
 
- def test_td_add_timestamp_overflow(self):
- msg = "int too (large|big) to convert"
- with pytest.raises(OverflowError, match=msg):
+ def test_td_add_timestamp_overflow(self, td_overflow_msg: str):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  Timestamp("1700-01-01") + Timedelta(13 * 19999, unit="D")
 
- with pytest.raises(OutOfBoundsTimedelta, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  Timestamp("1700-01-01") + timedelta(days=13 * 19999)
 
  @pytest.mark.parametrize("op", [operator.add, ops.radd])

pandas/tests/scalar/timedelta/test_constructors.py

@@ -13,18 +13,15 @@
 )
 
 
-def test_construct_from_td64_with_unit():
+def test_construct_from_td64_with_unit(td_overflow_msg: str):
  # ignore the unit, as it may cause silently overflows leading to incorrect
  # results, and in non-overflow cases is irrelevant GH#46827
  obj = np.timedelta64(123456789, "h")
 
- with pytest.raises(OutOfBoundsTimedelta, match="123456789 hours"):
- Timedelta(obj, unit="ps")
-
- with pytest.raises(OutOfBoundsTimedelta, match="123456789 hours"):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  Timedelta(obj, unit="ns")
 
- with pytest.raises(OutOfBoundsTimedelta, match="123456789 hours"):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  Timedelta(obj)
 
 
@@ -203,19 +200,17 @@ def test_td_from_repr_roundtrip(val):
  assert Timedelta(td._repr_base()) == td
 
 
-def test_overflow_on_construction():
- msg = "int too (large|big) to convert"
-
+def test_overflow_on_construction(td_overflow_msg: str):
  # GH#3374
  value = Timedelta("1day").value * 20169940
- with pytest.raises(OverflowError, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  Timedelta(value)
 
  # xref GH#17637
- with pytest.raises(OverflowError, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  Timedelta(7 * 19999, unit="D")
 
- with pytest.raises(OutOfBoundsTimedelta, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  Timedelta(timedelta(days=13 * 19999))
 
 

pandas/tests/scalar/timedelta/test_timedelta.py

@@ -13,6 +13,7 @@
  NaT,
  iNaT,
 )
+from pandas._libs.tslibs.np_datetime import OutOfBoundsTimedelta
 
 import pandas as pd
 from pandas import (
@@ -646,7 +647,7 @@ def test_timedelta_hash_equality(self):
  ns_td = Timedelta(1, "ns")
  assert hash(ns_td) != hash(ns_td.to_pytimedelta())
 
- def test_implementation_limits(self):
+ def test_implementation_limits(self, td_overflow_msg: str):
  min_td = Timedelta(Timedelta.min)
  max_td = Timedelta(Timedelta.max)
 
@@ -656,23 +657,22 @@ def test_implementation_limits(self):
  assert max_td.value == lib.i8max
 
  # Beyond lower limit, a NAT before the Overflow
- assert (min_td - Timedelta(1, "ns")) is NaT
+ assert (min_td - Timedelta(1, "ns")) is NaT # type: ignore[comparison-overlap]
 
- msg = "int too (large|big) to convert"
- with pytest.raises(OverflowError, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  min_td - Timedelta(2, "ns")
 
- with pytest.raises(OverflowError, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  max_td + Timedelta(1, "ns")
 
  # Same tests using the internal nanosecond values
  td = Timedelta(min_td.value - 1, "ns")
- assert td is NaT
+ assert td is NaT # type: ignore[comparison-overlap]
 
- with pytest.raises(OverflowError, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  Timedelta(min_td.value - 2, "ns")
 
- with pytest.raises(OverflowError, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  Timedelta(max_td.value + 1, "ns")
 
  def test_total_seconds_precision(self):

pandas/tests/scalar/timestamp/test_arithmetic.py

@@ -8,7 +8,7 @@
 import pytest
 
 from pandas._libs.tslibs import (
- OutOfBoundsDatetime,
+ OutOfBoundsTimedelta,
  Timedelta,
  Timestamp,
  offsets,
@@ -33,25 +33,20 @@ def test_overflow_offset(self):
  expected = Timestamp("1999/09/23")
  assert stamp - offset_no_overflow == expected
 
- def test_overflow_offset_raises(self):
+ def test_overflow_offset_raises(self, td_overflow_msg: str):
  # xref https://github.com/statsmodels/statsmodels/issues/3374
  # ends up multiplying really large numbers which overflow
 
  stamp = Timestamp("2017-01-13 00:00:00")
  offset_overflow = 20169940 * offsets.Day(1)
- msg = (
- "the add operation between "
- r"\<-?\d+ \* Days\> and \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} "
- "will overflow"
- )
  lmsg = "|".join(
  ["Python int too large to convert to C long", "int too big to convert"]
  )
 
  with pytest.raises(OverflowError, match=lmsg):
  stamp + offset_overflow
 
- with pytest.raises(OverflowError, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  offset_overflow + stamp
 
  with pytest.raises(OverflowError, match=lmsg):
@@ -61,12 +56,12 @@ def test_overflow_offset_raises(self):
  # used to crash, so check for proper overflow exception
 
  stamp = Timestamp("2000/1/1")
- offset_overflow = to_offset("D") * 100**5
+ offset_overflow = offsets.Day() * 100**5
 
  with pytest.raises(OverflowError, match=lmsg):
  stamp + offset_overflow
 
- with pytest.raises(OverflowError, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=td_overflow_msg):
  offset_overflow + stamp
 
  with pytest.raises(OverflowError, match=lmsg):
@@ -78,7 +73,7 @@ def test_overflow_timestamp_raises(self):
  a = Timestamp("2101-01-01 00:00:00")
  b = Timestamp("1688-01-01 00:00:00")
 
- with pytest.raises(OutOfBoundsDatetime, match=msg):
+ with pytest.raises(OutOfBoundsTimedelta, match=msg):
  a - b
 
  # but we're OK for timestamp and datetime.datetime

pandas/tests/tools/test_to_datetime.py

@@ -1839,13 +1839,8 @@ def test_to_datetime_overflow(self):
  # gh-17637
  # we are overflowing Timedelta range here
 
- msg = "|".join(
- [
- "Python int too large to convert to C long",
- "long too big to convert",
- "int too big to convert",
- ]
- )
+ # a fixture exists in tests/scalar; shoud it be moved to a higher level?
+ msg = R"outside allowed range \[-9223372036854775807ns, 9223372036854775807ns\]"
  with pytest.raises(OutOfBoundsTimedelta, match=msg):
  date_range(start="1/1/1700", freq="B", periods=100000)
 

pandas/tests/tools/test_to_timedelta.py

@@ -109,9 +109,7 @@ def test_to_timedelta_invalid_unit(self, arg):
 
  def test_to_timedelta_time(self):
  # time not supported ATM
- msg = (
- "Value must be Timedelta, string, integer, float, timedelta or convertible"
- )
+ msg = "Invalid type for timedelta scalar"
  with pytest.raises(ValueError, match=msg):
  to_timedelta(time(second=1))
  assert to_timedelta(time(second=1), errors="coerce") is pd.NaT
@@ -264,10 +262,7 @@ def test_to_timedelta_zerodim(self, fixed_now_ts):
  dt64 = fixed_now_ts.to_datetime64()
  arg = np.array(dt64)
 
- msg = (
- "Value must be Timedelta, string, integer, float, timedelta "
- "or convertible, not datetime64"
- )
+ msg = "Invalid type for timedelta scalar"
  with pytest.raises(ValueError, match=msg):
  to_timedelta(arg)
 

pandas/tests/tslibs/test_timedeltas.py

@@ -1,5 +1,3 @@
-import re
-
 import numpy as np
 import pytest
 
@@ -65,14 +63,8 @@ def test_huge_nanoseconds_overflow():
  "kwargs", [{"Seconds": 1}, {"seconds": 1, "Nanoseconds": 1}, {"Foo": 2}]
 )
 def test_kwarg_assertion(kwargs):
- err_message = (
- "cannot construct a Timedelta from the passed arguments, "
- "allowed keywords are "
- "[weeks, days, hours, minutes, seconds, "
- "milliseconds, microseconds, nanoseconds]"
- )
-
- with pytest.raises(ValueError, match=re.escape(err_message)):
+ msg = "cannot construct a Timedelta from the passed arguments"
+ with pytest.raises(ValueError, match=msg):
  Timedelta(**kwargs)