general: make time.tz.via_location user config lazy, move tests to my.tests package
also gets rid of the problematic reset_modules thingie
This commit is contained in:
Dima Gerasimov
karlicoss
parent
270080bd56
commit
a5643206a0
15 changed files with 269 additions and 233 deletions
|
|
@ -1,19 +0,0 @@
|
|||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from my.calendar.holidays import is_holiday
|
||||
|
||||
|
||||
def test() -> None:
|
||||
assert is_holiday('20190101')
|
||||
assert not is_holiday('20180601')
|
||||
assert is_holiday('20200906') # national holiday in Bulgaria
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def prepare(tmp_path: Path):
|
||||
from . import tz
|
||||
# todo meh. fixtures can't be called directly?
|
||||
orig = tz.prepare.__wrapped__ # type: ignore
|
||||
yield from orig(tmp_path)
|
||||
|
|
@ -1,125 +0,0 @@
|
|||
"""
|
||||
To test my.location.fallback_location.all
|
||||
"""
|
||||
|
||||
from typing import Iterator
|
||||
from datetime import datetime, timezone, timedelta
|
||||
|
||||
from more_itertools import ilen
|
||||
|
||||
from my.ip.common import IP
|
||||
|
||||
def data() -> Iterator[IP]:
|
||||
# random IP addresses
|
||||
yield IP(addr="67.98.113.0", dt=datetime(2020, 1, 1, 12, 0, 0, tzinfo=timezone.utc))
|
||||
yield IP(addr="67.98.112.0", dt=datetime(2020, 1, 15, 12, 0, 0, tzinfo=timezone.utc))
|
||||
yield IP(addr="59.40.113.87", dt=datetime(2020, 2, 1, 12, 0, 0, tzinfo=timezone.utc))
|
||||
yield IP(addr="59.40.139.87", dt=datetime(2020, 2, 1, 16, 0, 0, tzinfo=timezone.utc))
|
||||
yield IP(addr="161.235.192.228", dt=datetime(2020, 3, 1, 12, 0, 0, tzinfo=timezone.utc))
|
||||
|
||||
# redefine the my.ip.all function using data for testing
|
||||
import my.ip.all as ip_module
|
||||
ip_module.ips = data
|
||||
|
||||
from my.location.fallback import via_ip
|
||||
|
||||
# these are all tests for the bisect algorithm defined in via_ip.py
|
||||
# to make sure we can correctly find IPs that are within the 'for_duration' of a given datetime
|
||||
|
||||
def test_ip_fallback() -> None:
|
||||
# make sure that the data override works
|
||||
assert ilen(ip_module.ips()) == ilen(data())
|
||||
assert ilen(ip_module.ips()) == ilen(via_ip.fallback_locations())
|
||||
assert ilen(via_ip.fallback_locations()) == 5
|
||||
assert ilen(via_ip._sorted_fallback_locations()) == 5
|
||||
|
||||
# confirm duration from via_ip since that is used for bisect
|
||||
assert via_ip.config.for_duration == timedelta(hours=24)
|
||||
|
||||
# basic tests
|
||||
|
||||
# try estimating slightly before the first IP
|
||||
est = list(via_ip.estimate_location(datetime(2020, 1, 1, 11, 59, 59, tzinfo=timezone.utc)))
|
||||
assert len(est) == 0
|
||||
|
||||
# during the duration for the first IP
|
||||
est = list(via_ip.estimate_location(datetime(2020, 1, 1, 12, 30, 0, tzinfo=timezone.utc)))
|
||||
assert len(est) == 1
|
||||
|
||||
# right after the 'for_duration' for an IP
|
||||
est = list(via_ip.estimate_location(datetime(2020, 1, 1, 12, 0, 0, tzinfo=timezone.utc) + via_ip.config.for_duration + timedelta(seconds=1)))
|
||||
assert len(est) == 0
|
||||
|
||||
# on 2/1/2020, threes one IP if before 16:30
|
||||
est = list(via_ip.estimate_location(datetime(2020, 2, 1, 12, 30, 0, tzinfo=timezone.utc)))
|
||||
assert len(est) == 1
|
||||
|
||||
# and two if after 16:30
|
||||
est = list(via_ip.estimate_location(datetime(2020, 2, 1, 17, 00, 0, tzinfo=timezone.utc)))
|
||||
assert len(est) == 2
|
||||
|
||||
# the 12:30 IP should 'expire' before the 16:30 IP, use 3:30PM on the next day
|
||||
est = list(via_ip.estimate_location(datetime(2020, 2, 2, 15, 30, 0, tzinfo=timezone.utc)))
|
||||
assert len(est) == 1
|
||||
|
||||
use_dt = datetime(2020, 3, 1, 12, 15, 0, tzinfo=timezone.utc)
|
||||
|
||||
# test last IP
|
||||
est = list(via_ip.estimate_location(use_dt))
|
||||
assert len(est) == 1
|
||||
|
||||
# datetime should be the IPs, not the passed IP (if via_home, it uses the passed dt)
|
||||
assert est[0].dt != use_dt
|
||||
|
||||
# test interop with other fallback estimators/all.py
|
||||
#
|
||||
# redefine fallback_estimators to prevent possible namespace packages the user
|
||||
# may have installed from having side effects testing this
|
||||
from my.location.fallback import all
|
||||
from my.location.fallback import via_home
|
||||
def _fe() -> Iterator[all.LocationEstimator]:
|
||||
yield via_ip.estimate_location
|
||||
yield via_home.estimate_location
|
||||
|
||||
all.fallback_estimators = _fe
|
||||
assert ilen(all.fallback_estimators()) == 2
|
||||
|
||||
# test that all.estimate_location has access to both IPs
|
||||
#
|
||||
# just passing via_ip should give one IP
|
||||
from my.location.fallback.common import _iter_estimate_from
|
||||
raw_est = list(_iter_estimate_from(use_dt, (via_ip.estimate_location,)))
|
||||
assert len(raw_est) == 1
|
||||
assert raw_est[0].datasource == "via_ip"
|
||||
assert raw_est[0].accuracy == 15_000
|
||||
|
||||
# passing home should give one
|
||||
home_est = list(_iter_estimate_from(use_dt, (via_home.estimate_location,)))
|
||||
assert len(home_est) == 1
|
||||
assert home_est[0].accuracy == 30_000
|
||||
|
||||
# make sure ip accuracy is more accurate
|
||||
assert raw_est[0].accuracy < home_est[0].accuracy
|
||||
|
||||
# passing both should give two
|
||||
raw_est = list(_iter_estimate_from(use_dt, (via_ip.estimate_location, via_home.estimate_location)))
|
||||
assert len(raw_est) == 2
|
||||
|
||||
# shouldn't raise value error
|
||||
all_est = all.estimate_location(use_dt)
|
||||
# should have used the IP from via_ip since it was more accurate
|
||||
assert all_est.datasource == "via_ip"
|
||||
|
||||
# test that a home defined in shared_config.py is used if no IP is found
|
||||
loc = all.estimate_location(datetime(2021, 1, 1, 12, 30, 0, tzinfo=timezone.utc))
|
||||
assert loc.datasource == "via_home"
|
||||
|
||||
# test a different home using location.fallback.all
|
||||
bulgaria = all.estimate_location(datetime(2006, 1, 1, 12, 30, 0, tzinfo=timezone.utc))
|
||||
assert bulgaria.datasource == "via_home"
|
||||
assert (bulgaria.lat, bulgaria.lon) == (42.697842, 23.325973)
|
||||
assert (loc.lat, loc.lon) != (bulgaria.lat, bulgaria.lon)
|
||||
|
||||
|
||||
# re-use prepare fixture for overriding config from shared_config.py
|
||||
from .tz import prepare
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
from my.tests.common import skip_if_not_karlicoss as pytestmark
|
||||
|
||||
from my import orgmode
|
||||
from my.core.orgmode import collect
|
||||
|
||||
|
||||
def test() -> None:
|
||||
from my import orgmode
|
||||
from my.core.orgmode import collect
|
||||
|
||||
# meh
|
||||
results = list(orgmode.query().collect_all(lambda n: [n] if 'python' in n.tags else []))
|
||||
assert len(results) > 5
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
# Defines some shared config for tests
|
||||
|
||||
from datetime import datetime, date, timezone
|
||||
from pathlib import Path
|
||||
|
||||
from typing import Any, NamedTuple
|
||||
import my.time.tz.via_location as LTZ
|
||||
from more_itertools import one
|
||||
|
||||
|
||||
class SharedConfig(NamedTuple):
|
||||
google: Any
|
||||
location: Any
|
||||
time: Any
|
||||
|
||||
|
||||
def _prepare_google_config(tmp_path: Path):
|
||||
from my.tests.common import testdata
|
||||
try:
|
||||
track = one(testdata().rglob('italy-slovenia-2017-07-29.json'))
|
||||
except ValueError:
|
||||
raise RuntimeError('testdata not found, setup git submodules?')
|
||||
|
||||
|
||||
# todo ugh. unnecessary zipping, but at the moment takeout provider doesn't support plain dirs
|
||||
import zipfile
|
||||
with zipfile.ZipFile(tmp_path / 'takeout.zip', 'w') as zf:
|
||||
zf.writestr('Takeout/Location History/Location History.json', track.read_bytes())
|
||||
|
||||
class google_config:
|
||||
takeout_path = tmp_path
|
||||
return google_config
|
||||
|
||||
|
||||
# pass tmp_path from pytest to this helper function
|
||||
# see tests/tz.py as an example
|
||||
def temp_config(temp_path: Path) -> Any:
|
||||
from my.tests.common import reset_modules
|
||||
reset_modules()
|
||||
|
||||
LTZ.config.fast = True
|
||||
|
||||
class location:
|
||||
home_accuracy = 30_000
|
||||
home = (
|
||||
# supports ISO strings
|
||||
('2005-12-04' , (42.697842, 23.325973)), # Bulgaria, Sofia
|
||||
# supports date/datetime objects
|
||||
(date(year=1980, month=2, day=15) , (40.7128 , -74.0060 )), # NY
|
||||
# check tz handling..
|
||||
(datetime.fromtimestamp(1600000000, tz=timezone.utc), (55.7558 , 37.6173 )), # Moscow, Russia
|
||||
)
|
||||
# note: order doesn't matter, will be sorted in the data provider
|
||||
class via_ip:
|
||||
accuracy = 15_000
|
||||
class gpslogger:
|
||||
pass
|
||||
|
||||
class time:
|
||||
class tz:
|
||||
class via_location:
|
||||
pass # just rely on the defaults...
|
||||
|
||||
|
||||
return SharedConfig(google=_prepare_google_config(temp_path), location=location, time=time)
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python3
|
||||
from my.tests.common import skip_if_not_karlicoss as pytestmark
|
||||
from datetime import datetime, timezone
|
||||
from itertools import islice
|
||||
import pytz
|
||||
|
|
|
|||
95
tests/tz.py
95
tests/tz.py
|
|
@ -1,95 +0,0 @@
|
|||
import sys
|
||||
from datetime import datetime, timedelta
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
import pytz
|
||||
|
||||
from my.core.error import notnone
|
||||
|
||||
import my.time.tz.main as TZ
|
||||
import my.time.tz.via_location as LTZ
|
||||
|
||||
|
||||
def test_iter_tzs() -> None:
|
||||
ll = list(LTZ._iter_tzs())
|
||||
assert len(ll) > 3
|
||||
|
||||
|
||||
def test_past() -> None:
|
||||
# should fallback to the home location provider
|
||||
dt = D('20000101 12:34:45')
|
||||
dt = TZ.localize(dt)
|
||||
tz = dt.tzinfo
|
||||
assert tz is not None
|
||||
assert getattr(tz, 'zone') == 'America/New_York'
|
||||
|
||||
|
||||
def test_future() -> None:
|
||||
fut = datetime.now() + timedelta(days=100)
|
||||
# shouldn't crash at least
|
||||
assert TZ.localize(fut) is not None
|
||||
|
||||
|
||||
def test_tz() -> None:
|
||||
# todo hmm, the way it's implemented at the moment, never returns None?
|
||||
|
||||
# not present in the test data
|
||||
tz = LTZ._get_tz(D('20200101 10:00:00'))
|
||||
assert notnone(tz).zone == 'Europe/Sofia'
|
||||
|
||||
tz = LTZ._get_tz(D('20170801 11:00:00'))
|
||||
assert notnone(tz).zone == 'Europe/Vienna'
|
||||
|
||||
tz = LTZ._get_tz(D('20170730 10:00:00'))
|
||||
assert notnone(tz).zone == 'Europe/Rome'
|
||||
|
||||
tz = LTZ._get_tz(D('20201001 14:15:16'))
|
||||
assert tz is not None
|
||||
|
||||
on_windows = sys.platform == 'win32'
|
||||
if not on_windows:
|
||||
tz = LTZ._get_tz(datetime.min)
|
||||
assert tz is not None
|
||||
else:
|
||||
# seems this fails because windows doesn't support same date ranges
|
||||
# https://stackoverflow.com/a/41400321/
|
||||
with pytest.raises(OSError):
|
||||
LTZ._get_tz(datetime.min)
|
||||
|
||||
|
||||
def test_policies() -> None:
|
||||
getzone = lambda dt: getattr(dt.tzinfo, 'zone')
|
||||
|
||||
naive = D('20170730 10:00:00')
|
||||
# actual timezone at the time
|
||||
assert getzone(TZ.localize(naive)) == 'Europe/Rome'
|
||||
|
||||
z = pytz.timezone('America/New_York')
|
||||
aware = z.localize(naive)
|
||||
|
||||
assert getzone(TZ.localize(aware)) == 'America/New_York'
|
||||
|
||||
assert getzone(TZ.localize(aware, policy='convert')) == 'Europe/Rome'
|
||||
|
||||
|
||||
with pytest.raises(RuntimeError):
|
||||
assert TZ.localize(aware, policy='throw')
|
||||
|
||||
|
||||
def D(dstr: str) -> datetime:
|
||||
return datetime.strptime(dstr, '%Y%m%d %H:%M:%S')
|
||||
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def prepare(tmp_path: Path):
|
||||
from .shared_config import temp_config
|
||||
conf = temp_config(tmp_path)
|
||||
|
||||
import my.core.cfg as C
|
||||
with C.tmp_config() as config:
|
||||
config.google = conf.google
|
||||
config.time = conf.time
|
||||
config.location = conf.location
|
||||
yield
|
||||
Loading…
Add table
Add a link
Reference in a new issue