Remove obsolete test helpers

Author: sdispater

pendulum/__init__.py

@@ -29,12 +29,8 @@
 from pendulum.formatting import Formatter
 from pendulum.helpers import format_diff
 from pendulum.helpers import get_locale
-from pendulum.helpers import get_test_now
-from pendulum.helpers import has_test_now
 from pendulum.helpers import locale
 from pendulum.helpers import set_locale
-from pendulum.helpers import set_test_now
-from pendulum.helpers import test
 from pendulum.helpers import week_ends_at
 from pendulum.helpers import week_starts_at
 from pendulum.parser import parse
@@ -240,8 +236,7 @@ def from_format(
     """
     Creates a DateTime instance from a specific format.
     """
-    parts = _formatter.parse(string, fmt, now(), locale=locale)
-
+    parts = _formatter.parse(string, fmt, now(tz=tz), locale=locale)
     if parts["tz"] is None:
         parts["tz"] = tz
 
@@ -338,17 +333,13 @@ def period(start: DateTime, end: DateTime, absolute: bool = False) -> Period:
     "from_format",
     "from_timestamp",
     "get_locale",
-    "get_test_now",
-    "has_test_now",
     "instance",
     "local",
     "locale",
     "naive",
     "now",
     "period",
     "set_locale",
-    "set_test_now",
-    "test",
     "week_ends_at",
     "week_starts_at",
     "parse",

pendulum/date.py

@@ -24,8 +24,6 @@
 from pendulum.constants import YEARS_PER_DECADE
 from pendulum.exceptions import PendulumException
 from pendulum.helpers import add_duration
-from pendulum.helpers import get_test_now
-from pendulum.helpers import has_test_now
 from pendulum.mixins.default import FormattableMixin
 from pendulum.period import Period
 
@@ -733,9 +731,6 @@ def average(self, dt: date | None = None) -> Date:
 
     @classmethod
     def today(cls) -> Date:
-        if has_test_now():
-            return cast(pendulum.DateTime, get_test_now()).date()
-
         dt = date.today()
 
         return cls(dt.year, dt.month, dt.day)

pendulum/datetime.py

@@ -32,8 +32,6 @@
 from pendulum.date import Date
 from pendulum.exceptions import PendulumException
 from pendulum.helpers import add_duration
-from pendulum.helpers import get_test_now
-from pendulum.helpers import has_test_now
 from pendulum.period import Period
 from pendulum.time import Time
 from pendulum.tz import UTC
@@ -135,15 +133,6 @@ def now(
         """
         Get a DateTime instance for the current date and time.
         """
-        if has_test_now():
-            test_instance: DateTime = cast(DateTime, get_test_now())
-            _tz = pendulum._safe_timezone(tz)
-
-            if tz is not None and _tz != test_instance.timezone:
-                test_instance = test_instance.in_tz(_tz)
-
-            return test_instance
-
         if tz is None or tz == "local":
             dt = datetime.datetime.now(local_timezone())
         elif tz is UTC or tz == "UTC":

pendulum/helpers.py

@@ -3,13 +3,11 @@
 import os
 import struct
 
-from contextlib import contextmanager
 from datetime import date
 from datetime import datetime
 from datetime import timedelta
 from math import copysign
 from typing import TYPE_CHECKING
-from typing import Iterator
 from typing import TypeVar
 from typing import overload
 
@@ -178,27 +176,6 @@ def _sign(x: float) -> int:
 # Global helpers
 
 
-@contextmanager
-def test(mock: pendulum.DateTime) -> Iterator[None]:
-    set_test_now(mock)
-    try:
-        yield
-    finally:
-        set_test_now()
-
-
-def set_test_now(test_now: pendulum.DateTime | None = None) -> None:
-    pendulum._TEST_NOW = test_now
-
-
-def get_test_now() -> pendulum.DateTime | None:
-    return pendulum._TEST_NOW
-
-
-def has_test_now() -> bool:
-    return pendulum._TEST_NOW is not None
-
-
 def locale(name: str) -> Locale:
     return Locale.load(name)
 
@@ -238,10 +215,6 @@ def week_ends_at(wday: int) -> None:
     "week_day",
     "add_duration",
     "format_diff",
-    "test",
-    "set_test_now",
-    "get_test_now",
-    "has_test_now",
     "locale",
     "set_locale",
     "get_locale",

pendulum/parser.py

@@ -24,7 +24,7 @@
 
 def parse(text: str, **options: t.Any) -> Date | Time | DateTime | Duration:
     # Use the mock now value if it exists
-    options["now"] = options.get("now", pendulum.get_test_now())
+    options["now"] = options.get("now")
 
     return _parse(text, **options)
 

tests/conftest.py

@@ -11,7 +11,6 @@ def setup():
 
     yield
 
-    pendulum.set_test_now()
     pendulum.set_locale("en")
     pendulum.set_local_timezone()
     pendulum.week_starts_at(pendulum.MONDAY)

tests/date/test_diff.py

@@ -129,13 +129,13 @@ def test_diff_for_humans_now_and_nearly_month(today):
 
 
 def test_diff_for_humans_now_and_month():
-    with pendulum.test(pendulum.datetime(2016, 4, 1)):
+    with pendulum.travel_to(pendulum.datetime(2016, 4, 1)):
         today = pendulum.today().date()
 
         assert today.subtract(weeks=4).diff_for_humans() == "4 weeks ago"
         assert today.subtract(months=1).diff_for_humans() == "1 month ago"
 
-    with pendulum.test(pendulum.datetime(2017, 3, 1)):
+    with pendulum.travel_to(pendulum.datetime(2017, 3, 1)):
         today = pendulum.today().date()
 
         assert today.subtract(weeks=4).diff_for_humans() == "1 month ago"
@@ -182,23 +182,23 @@ def test_diff_for_humans_now_and_nearly_future_month(today):
 
 
 def test_diff_for_humans_now_and_future_month():
-    with pendulum.test(pendulum.datetime(2016, 3, 1)):
+    with pendulum.travel_to(pendulum.datetime(2016, 3, 1)):
         today = pendulum.today("UTC").date()
 
         assert today.add(weeks=4).diff_for_humans() == "in 4 weeks"
         assert today.add(months=1).diff_for_humans() == "in 1 month"
 
-    with pendulum.test(pendulum.datetime(2017, 3, 31)):
+    with pendulum.travel_to(pendulum.datetime(2017, 3, 31)):
         today = pendulum.today("UTC").date()
 
         assert today.add(months=1).diff_for_humans() == "in 1 month"
 
-    with pendulum.test(pendulum.datetime(2017, 4, 30)):
+    with pendulum.travel_to(pendulum.datetime(2017, 4, 30)):
         today = pendulum.today("UTC").date()
 
         assert today.add(months=1).diff_for_humans() == "in 1 month"
 
-    with pendulum.test(pendulum.datetime(2017, 1, 31)):
+    with pendulum.travel_to(pendulum.datetime(2017, 1, 31)):
         today = pendulum.today("UTC").date()
 
         assert today.add(weeks=4).diff_for_humans() == "in 1 month"
@@ -245,23 +245,23 @@ def test_diff_for_humans_other_and_nearly_month(today):
 
 
 def test_diff_for_humans_other_and_month():
-    with pendulum.test(pendulum.datetime(2016, 3, 1)):
+    with pendulum.travel_to(pendulum.datetime(2016, 3, 1)):
         today = pendulum.today().date()
 
         assert today.diff_for_humans(today.add(weeks=4)) == "4 weeks before"
         assert today.diff_for_humans(today.add(months=1)) == "1 month before"
 
-    with pendulum.test(pendulum.datetime(2017, 3, 31)):
+    with pendulum.travel_to(pendulum.datetime(2017, 3, 31)):
         today = pendulum.today().date()
 
         assert today.diff_for_humans(today.add(months=1)) == "1 month before"
 
-    with pendulum.test(pendulum.datetime(2017, 4, 30)):
+    with pendulum.travel_to(pendulum.datetime(2017, 4, 30)):
         today = pendulum.today().date()
 
         assert today.diff_for_humans(today.add(months=1)) == "1 month before"
 
-    with pendulum.test(pendulum.datetime(2017, 1, 31)):
+    with pendulum.travel_to(pendulum.datetime(2017, 1, 31)):
         today = pendulum.today().date()
 
         assert today.diff_for_humans(today.add(weeks=4)) == "1 month before"
@@ -308,13 +308,13 @@ def test_diff_for_humans_other_and_nearly_future_month(today):
 
 
 def test_diff_for_humans_other_and_future_month():
-    with pendulum.test(pendulum.datetime(2016, 3, 1)):
+    with pendulum.travel_to(pendulum.datetime(2016, 3, 1)):
         today = pendulum.today().date()
 
         assert today.diff_for_humans(today.subtract(weeks=4)) == "4 weeks after"
         assert today.diff_for_humans(today.subtract(months=1)) == "1 month after"
 
-    with pendulum.test(pendulum.datetime(2017, 2, 28)):
+    with pendulum.travel_to(pendulum.datetime(2017, 2, 28)):
         today = pendulum.today().date()
 
         assert today.diff_for_humans(today.subtract(weeks=4)) == "1 month after"

tests/datetime/test_comparison.py

@@ -241,7 +241,7 @@ def test_less_than_or_equal_with_timezone_false():
 
 
 def test_is_anniversary():
-    with pendulum.test(pendulum.now()):
+    with pendulum.travel_to(pendulum.now()):
         d = pendulum.now()
         an_anniversary = d.subtract(years=1)
         assert an_anniversary.is_anniversary()
@@ -258,7 +258,7 @@ def test_is_anniversary():
 
 
 def test_is_birthday():  # backward compatibility
-    with pendulum.test(pendulum.now()):
+    with pendulum.travel_to(pendulum.now()):
         d = pendulum.now()
         an_anniversary = d.subtract(years=1)
         assert an_anniversary.is_birthday()