daemon: Session cleanup, removed unused functions, used context managers for writing files, made variables used externally no longer private

This commit is contained in:
Blake Harnden 2020-06-12 20:22:51 -07:00
parent 178d12b327
commit 23d957679e
11 changed files with 99 additions and 220 deletions

View file

@ -133,7 +133,7 @@ class TestGrpc:
assert wlan_node.id in session.nodes
assert session.nodes[node1.id].netif(0) is not None
assert session.nodes[node2.id].netif(0) is not None
hook_file, hook_data = session._hooks[EventTypes.RUNTIME_STATE][0]
hook_file, hook_data = session.hooks[EventTypes.RUNTIME_STATE][0]
assert hook_file == hook.file
assert hook_data == hook.data
assert session.location.refxyz == (location_x, location_y, location_z)

View file

@ -382,7 +382,7 @@ class TestGui:
def test_file_hook_add(self, coretlv: CoreHandler):
state = EventTypes.DATACOLLECT_STATE
assert coretlv.session._hooks.get(state) is None
assert coretlv.session.hooks.get(state) is None
file_name = "test.sh"
file_data = "echo hello"
message = coreapi.CoreFileMessage.create(
@ -396,7 +396,7 @@ class TestGui:
coretlv.handle_message(message)
hooks = coretlv.session._hooks.get(state)
hooks = coretlv.session.hooks.get(state)
assert len(hooks) == 1
name, data = hooks[0]
assert file_name == name

View file

@ -48,7 +48,7 @@ class TestXml:
session.open_xml(file_path, start=True)
# verify nodes have been recreated
runtime_hooks = session._hooks.get(state)
runtime_hooks = session.hooks.get(state)
assert runtime_hooks
runtime_hook = runtime_hooks[0]
assert file_name == runtime_hook[0]