summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-09-01 16:28:40 -0400
committerScott Murray <scott.murray@konsulko.com>2020-09-01 16:28:40 -0400
commit6642aabf9b81564274802e120abb79e74a6f4b8b (patch)
treebcfb0fea8aa968eb23f507d502477eba1da2bd28
parentb55f0a76630d29292618e3831832ec77eff08d34 (diff)
Assume network connectivity
Revert the xfail changes to the geoclue and weather tests, as it's been clarified that network connectivity is assumed present in AGL CI. Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-rw-r--r--pyagl/tests/test_geoclue.py7
-rw-r--r--pyagl/tests/test_weather.py5
2 files changed, 5 insertions, 7 deletions
diff --git a/pyagl/tests/test_geoclue.py b/pyagl/tests/test_geoclue.py
index 7628042..50210d8 100644
--- a/pyagl/tests/test_geoclue.py
+++ b/pyagl/tests/test_geoclue.py
@@ -37,7 +37,6 @@ async def service():
yield svc
await svc.websocket.close()
-@pytest.mark.xfail(reason='expected to fail if no internet connection is available or geoclue has no data')
@pytest.mark.regular
async def test_location(event_loop, service: gcs):
msgid = await service.location()
@@ -55,9 +54,9 @@ async def test_subscribe(event_loop, service: gcs):
msgid = await service.subscribe()
resp = await service.afbresponse()
assert resp.status == 'success'
- # event = await service.afbresponse()
- # assert event.type == AFBT.EVENT # subscription immediately emits geoclue event
- # assert event.api == f'{service.api}/location'
+ event = await service.afbresponse()
+ assert event.type == AFBT.EVENT # subscription immediately emits geoclue event
+ assert event.api == f'{service.api}/location'
@pytest.mark.regular
diff --git a/pyagl/tests/test_weather.py b/pyagl/tests/test_weather.py
index cbf4b64..0b2ff9e 100644
--- a/pyagl/tests/test_weather.py
+++ b/pyagl/tests/test_weather.py
@@ -44,7 +44,6 @@ async def test_apikey(event_loop, service: ws):
assert resp.msgid == msgid
assert resp.data['api_key'] == 'a860fa437924aec3d0360cc749e25f0e'
-@pytest.mark.xfail(reason='expecting this to fail without internet connection')
async def test_current_weather(event_loop, service: ws):
msgid = await service.current_weather()
resp = await service.afbresponse()
@@ -70,8 +69,8 @@ async def test_subscribe_weather(event_loop, service: ws):
msgid = await service.subscribe(event)
resp = await service.afbresponse()
assert resp.status == 'success'
- # eventresp = await service.afbresponse() # immediately emits event after subscription
- # assert eventresp.api == f'{service.api}/{event}'
+ eventresp = await service.afbresponse() # immediately emits event after subscription
+ assert eventresp.api == f'{service.api}/{event}'
@pytest.mark.dependency(depends=['test_subscribe_weather'])