Big refactoring sweep through tests

veilid-python/tests/test_basic.py

@@ -1,39 +1,46 @@
 # Basic veilid tests
 
-import veilid
+import socket
+
 import pytest
-from . import *
+import veilid
+
+from . import api_connection, simple_update_callback
 
 ##################################################################
 
+
 @pytest.mark.asyncio
-async def test_connect():
-    async def func(api: veilid.VeilidAPI):
-        pass
-    await simple_connect_and_run(func)
+async def test_connect(api_connection):
+    pass
 
 
 @pytest.mark.asyncio
-async def test_get_node_id():
-    async def func(api: veilid.VeilidAPI):
-        # get our own node id
-        state = await api.get_state()
-        node_id = state.config.config.network.routing_table.node_id.pop()
-    await simple_connect_and_run(func)
+async def test_get_node_id(api_connection):
+    state = await api_connection.get_state()
+    node_ids = state.config.config.network.routing_table.node_id
+
+    assert len(node_ids) >= 1
+
+    for node_id in node_ids:
+        assert node_id[4] == ":"
+
 
 @pytest.mark.asyncio
 async def test_fail_connect():
-    with pytest.raises(Exception):
-        api = await veilid.json_api_connect("fuahwelifuh32luhwafluehawea", 1, simple_update_callback)
-        async with api:
-            pass
+    with pytest.raises(socket.gaierror) as exc:
+        await veilid.json_api_connect(
+            "fuahwelifuh32luhwafluehawea", 1, simple_update_callback
+        )
+
+    assert exc.value.errno == socket.EAI_NONAME
+
 
 @pytest.mark.asyncio
-async def test_version():
-    async def func(api: veilid.VeilidAPI):
-        v = await api.veilid_version()
-        print("veilid_version: {}".format(v.__dict__))
-        vstr = await api.veilid_version_string()
-        print("veilid_version_string: {}".format(vstr))
-    await simple_connect_and_run(func)
+async def test_version(api_connection):
+    v = await api_connection.veilid_version()
+    print(f"veilid_version: {v.__dict__}")
+    assert v.__dict__.keys() >= {"_major", "_minor", "_patch"}
 
+    vstr = await api_connection.veilid_version_string()
+    print(f"veilid_version_string: {vstr}")