Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pytest warnings #84

Merged
merged 4 commits into from
Mar 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[pytest]
asyncio_mode = auto
log_level = DEBUG
22 changes: 11 additions & 11 deletions tests/test_nws.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
ZONE = "test_zone"


async def test_nws_points_stations(aiohttp_client, loop, mock_urls):
async def test_nws_points_stations(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand All @@ -23,7 +23,7 @@ async def test_nws_points_stations(aiohttp_client, loop, mock_urls):
assert isinstance(stations, list)


async def test_nws_points(aiohttp_client, loop, mock_urls):
async def test_nws_points(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand All @@ -38,7 +38,7 @@ async def test_nws_points(aiohttp_client, loop, mock_urls):
assert nws.fire_weather_zone


async def test_nws_stations_observations(aiohttp_client, loop, mock_urls):
async def test_nws_stations_observations(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand All @@ -51,7 +51,7 @@ async def test_nws_stations_observations(aiohttp_client, loop, mock_urls):
assert isinstance(observations, list)


async def test_nws_stations_observations_latest(aiohttp_client, loop, mock_urls):
async def test_nws_stations_observations_latest(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand All @@ -64,7 +64,7 @@ async def test_nws_stations_observations_latest(aiohttp_client, loop, mock_urls)
assert isinstance(observation, dict)


async def test_nws_detailed_forecast(aiohttp_client, loop, mock_urls):
async def test_nws_detailed_forecast(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand Down Expand Up @@ -105,7 +105,7 @@ async def test_nws_detailed_forecast(aiohttp_client, loop, mock_urls):
assert Detail.TEMPERATURE in details


async def test_nws_gridpoints_forecast(aiohttp_client, loop, mock_urls):
async def test_nws_gridpoints_forecast(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand All @@ -123,7 +123,7 @@ async def test_nws_gridpoints_forecast(aiohttp_client, loop, mock_urls):
assert values["windSpeed"] == "10 mph"


async def test_nws_gridpoints_forecast_hourly(aiohttp_client, loop, mock_urls):
async def test_nws_gridpoints_forecast_hourly(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand All @@ -141,7 +141,7 @@ async def test_nws_gridpoints_forecast_hourly(aiohttp_client, loop, mock_urls):
assert values["windSpeed"] == "0 mph"


async def test_nws_alerts_active_zone(aiohttp_client, loop, mock_urls):
async def test_nws_alerts_active_zone(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand All @@ -151,7 +151,7 @@ async def test_nws_alerts_active_zone(aiohttp_client, loop, mock_urls):
assert isinstance(alerts, list)


async def test_nws_alerts_forecast_zone(aiohttp_client, loop, mock_urls):
async def test_nws_alerts_forecast_zone(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand All @@ -161,7 +161,7 @@ async def test_nws_alerts_forecast_zone(aiohttp_client, loop, mock_urls):
assert isinstance(alerts, list)


async def test_nws_alerts_county_zone(aiohttp_client, loop, mock_urls):
async def test_nws_alerts_county_zone(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand All @@ -171,7 +171,7 @@ async def test_nws_alerts_county_zone(aiohttp_client, loop, mock_urls):
assert isinstance(alerts, list)


async def test_nws_alerts_fire_weather_zone(aiohttp_client, loop, mock_urls):
async def test_nws_alerts_fire_weather_zone(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = Nws(client, USERID, LATLON)
Expand Down
18 changes: 10 additions & 8 deletions tests/test_raw.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
ZONE = "test"


async def test_points_stations(aiohttp_client, loop, mock_urls):
async def test_points_stations(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
await raw_data.raw_points_stations(*LATLON, client, USERID)


async def test_points(aiohttp_client, loop, mock_urls):
async def test_points(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
await raw_data.raw_points(*LATLON, client, USERID)


async def test_stations_observations(aiohttp_client, loop, mock_urls):
async def test_stations_observations(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
await raw_data.raw_stations_observations(STATION, client, USERID)
Expand All @@ -36,32 +36,34 @@ async def test_stations_observations(aiohttp_client, loop, mock_urls):
)


async def test_stations_observations_start_datetime(aiohttp_client, loop, mock_urls):
async def test_stations_observations_start_datetime(
aiohttp_client, event_loop, mock_urls
):
app = setup_app()
client = await aiohttp_client(app)
with pytest.raises(ValueError):
await raw_data.raw_stations_observations(STATION, client, USERID, start="1PM")


async def test_detailed_forecast(aiohttp_client, loop, mock_urls):
async def test_detailed_forecast(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
await raw_data.raw_detailed_forecast(WFO, X, Y, client, USERID)


async def test_gridpoints_forecast(aiohttp_client, loop, mock_urls):
async def test_gridpoints_forecast(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
await raw_data.raw_gridpoints_forecast(WFO, X, Y, client, USERID)


async def test_gridpoints_forecast_hourly(aiohttp_client, loop, mock_urls):
async def test_gridpoints_forecast_hourly(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
await raw_data.raw_gridpoints_forecast_hourly(WFO, X, Y, client, USERID)


async def test_alerts_active_zone(aiohttp_client, loop, mock_urls):
async def test_alerts_active_zone(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
await raw_data.raw_alerts_active_zone(ZONE, client, USERID)
42 changes: 22 additions & 20 deletions tests/test_simple_nws.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
ZONE = "test_zone"


async def test_nws_set_station(aiohttp_client, loop, mock_urls):
async def test_nws_set_station(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -19,7 +19,7 @@ async def test_nws_set_station(aiohttp_client, loop, mock_urls):
assert nws.stations == [STATION]


async def test_nws_set_station_none(aiohttp_client, loop, mock_urls):
async def test_nws_set_station_none(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -38,7 +38,7 @@ async def test_nws_set_station_none(aiohttp_client, loop, mock_urls):
"stations_observations_multiple_unsorted.json",
],
)
async def test_nws_observation(aiohttp_client, loop, mock_urls, observation_json):
async def test_nws_observation(aiohttp_client, event_loop, mock_urls, observation_json):
app = setup_app(stations_observations=observation_json)
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -61,7 +61,7 @@ async def test_nws_observation(aiohttp_client, loop, mock_urls, observation_json
assert observation["iconWeather"][0][1] is None


async def test_nws_observation_units(aiohttp_client, loop, mock_urls):
async def test_nws_observation_units(aiohttp_client, event_loop, mock_urls):
app = setup_app(stations_observations="stations_observations_alternate_units.json")
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -74,7 +74,7 @@ async def test_nws_observation_units(aiohttp_client, loop, mock_urls):
assert observation["windGust"] == 10


async def test_nws_observation_metar(aiohttp_client, loop, mock_urls):
async def test_nws_observation_metar(aiohttp_client, event_loop, mock_urls):
app = setup_app(stations_observations="stations_observations_metar.json")
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -92,7 +92,7 @@ async def test_nws_observation_metar(aiohttp_client, loop, mock_urls):
assert observation["windGust"] is None


async def test_nws_observation_metar_noparse(aiohttp_client, loop, mock_urls):
async def test_nws_observation_metar_noparse(aiohttp_client, event_loop, mock_urls):
app = setup_app(stations_observations="stations_observations_metar_noparse.json")
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -102,7 +102,7 @@ async def test_nws_observation_metar_noparse(aiohttp_client, loop, mock_urls):
assert observation["temperature"] is None


async def test_nws_observation_empty(aiohttp_client, loop, mock_urls):
async def test_nws_observation_empty(aiohttp_client, event_loop, mock_urls):
app = setup_app(stations_observations="stations_observations_empty.json")
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -122,7 +122,7 @@ async def test_nws_observation_empty(aiohttp_client, loop, mock_urls):
assert observation["iconWeather"] is None


async def test_nws_observation_noprop(aiohttp_client, loop, mock_urls):
async def test_nws_observation_noprop(aiohttp_client, event_loop, mock_urls):
app = setup_app(stations_observations="stations_observations_noprop.json")
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -133,7 +133,7 @@ async def test_nws_observation_noprop(aiohttp_client, loop, mock_urls):
assert observation is None


async def test_nws_observation_missing_value(aiohttp_client, loop, mock_urls):
async def test_nws_observation_missing_value(aiohttp_client, event_loop, mock_urls):
app = setup_app(stations_observations="stations_observations_missing_value.json")
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -154,7 +154,7 @@ async def test_nws_observation_missing_value(aiohttp_client, loop, mock_urls):


@freeze_time("2019-10-13T14:30:00-04:00")
async def test_nws_forecast(aiohttp_client, loop, mock_urls):
async def test_nws_forecast(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -170,7 +170,7 @@ async def test_nws_forecast(aiohttp_client, loop, mock_urls):


@freeze_time("2019-10-14T21:30:00-04:00")
async def test_nws_forecast_discard_stale(aiohttp_client, loop, mock_urls):
async def test_nws_forecast_discard_stale(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client, filter_forecast=True)
Expand All @@ -186,7 +186,7 @@ async def test_nws_forecast_discard_stale(aiohttp_client, loop, mock_urls):


@freeze_time("2019-10-14T20:30:00-04:00")
async def test_nws_forecast_hourly(aiohttp_client, loop, mock_urls):
async def test_nws_forecast_hourly(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -197,7 +197,7 @@ async def test_nws_forecast_hourly(aiohttp_client, loop, mock_urls):


@freeze_time("2019-10-13T14:30:00-04:00")
async def test_nws_forecast_strings(aiohttp_client, loop, mock_urls):
async def test_nws_forecast_strings(aiohttp_client, event_loop, mock_urls):
app = setup_app(gridpoints_forecast="gridpoints_forecast_strings.json")
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -213,7 +213,7 @@ async def test_nws_forecast_strings(aiohttp_client, loop, mock_urls):


@freeze_time("2019-10-13T14:30:00-04:00")
async def test_nws_forecast_empty(aiohttp_client, loop, mock_urls):
async def test_nws_forecast_empty(aiohttp_client, event_loop, mock_urls):
app = setup_app(gridpoints_forecast="gridpoints_forecast_empty.json")
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -223,7 +223,7 @@ async def test_nws_forecast_empty(aiohttp_client, loop, mock_urls):
assert forecast == []


async def test_nws_alerts_forecast_zone(aiohttp_client, loop, mock_urls):
async def test_nws_alerts_forecast_zone(aiohttp_client, event_loop, mock_urls):
app = setup_app(
alerts_active_zone=["alerts_active_zone.json", "alerts_active_zone_second.json"]
)
Expand All @@ -244,7 +244,7 @@ async def test_nws_alerts_forecast_zone(aiohttp_client, loop, mock_urls):
assert len(alerts) == 2


async def test_nws_alerts_county_zone(aiohttp_client, loop, mock_urls):
async def test_nws_alerts_county_zone(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -253,7 +253,7 @@ async def test_nws_alerts_county_zone(aiohttp_client, loop, mock_urls):
assert alerts


async def test_nws_alerts_fire_weather_zone(aiohttp_client, loop, mock_urls):
async def test_nws_alerts_fire_weather_zone(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -262,7 +262,7 @@ async def test_nws_alerts_fire_weather_zone(aiohttp_client, loop, mock_urls):
assert alerts


async def test_nws_alerts_all_zones(aiohttp_client, loop, mock_urls):
async def test_nws_alerts_all_zones(aiohttp_client, event_loop, mock_urls):
app = setup_app()
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -275,7 +275,9 @@ async def test_nws_alerts_all_zones(aiohttp_client, loop, mock_urls):
assert len(alerts) == 1


async def test_nws_alerts_all_zones_after_forecast(aiohttp_client, loop, mock_urls):
async def test_nws_alerts_all_zones_after_forecast(
aiohttp_client, event_loop, mock_urls
):
app = setup_app()
client = await aiohttp_client(app)
nws = SimpleNWS(*LATLON, USERID, client)
Expand All @@ -289,7 +291,7 @@ async def test_nws_alerts_all_zones_after_forecast(aiohttp_client, loop, mock_ur
assert len(alerts) == 1


async def test_nws_alerts_all_zones_second_alert(aiohttp_client, loop, mock_urls):
async def test_nws_alerts_all_zones_second_alert(aiohttp_client, event_loop, mock_urls):
app = setup_app(
alerts_active_zone=["alerts_active_zone.json", "alerts_active_zone_second.json"]
)
Expand Down