small test cleanup, can isolate to a singular core test fixture
This commit is contained in:
parent
45a11f7586
commit
f767c32643
8 changed files with 67 additions and 79 deletions
|
@ -12,7 +12,7 @@ from core.emane.rfpipe import EmaneRfPipeModel
|
|||
|
||||
|
||||
class TestGui:
|
||||
def test_80211(self, core_emane):
|
||||
def test_80211(self, core):
|
||||
"""
|
||||
Test emane 80211 model.
|
||||
|
||||
|
@ -20,31 +20,31 @@ class TestGui:
|
|||
"""
|
||||
|
||||
# create emane node for networking the core nodes
|
||||
emane_node = core_emane.session.add_object(name="emane", cls=EmaneNode)
|
||||
emane_node = core.session.add_object(name="emane", cls=EmaneNode)
|
||||
emane_node.setposition(x=80, y=50)
|
||||
|
||||
# set the emane model
|
||||
core_emane.set_emane_model(emane_node, EmaneIeee80211abgModel)
|
||||
core.set_emane_model(emane_node, EmaneIeee80211abgModel)
|
||||
|
||||
# create nodes
|
||||
core_emane.create_node("n1", objid=1, position=(150, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core_emane.create_node("n2", objid=2, position=(300, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core.create_node("n1", objid=1, position=(150, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core.create_node("n2", objid=2, position=(300, 150), services=EMANE_SERVICES, model="mdr")
|
||||
|
||||
# add interfaces to nodes
|
||||
core_emane.add_interface(emane_node, "n1")
|
||||
core_emane.add_interface(emane_node, "n2")
|
||||
core.add_interface(emane_node, "n1")
|
||||
core.add_interface(emane_node, "n2")
|
||||
|
||||
# instantiate session
|
||||
core_emane.session.instantiate()
|
||||
core.session.instantiate()
|
||||
|
||||
# assert node directories created
|
||||
core_emane.assert_nodes()
|
||||
core.assert_nodes()
|
||||
|
||||
# ping n2 from n1 and assert success
|
||||
status = core_emane.ping("n1", "n2")
|
||||
status = core.ping("n1", "n2")
|
||||
assert not status
|
||||
|
||||
def test_rfpipe(self, core_emane):
|
||||
def test_rfpipe(self, core):
|
||||
"""
|
||||
Test emane 80211 model.
|
||||
|
||||
|
@ -52,31 +52,31 @@ class TestGui:
|
|||
"""
|
||||
|
||||
# create emane node for networking the core nodes
|
||||
emane_node = core_emane.session.add_object(name="emane", cls=EmaneNode)
|
||||
emane_node = core.session.add_object(name="emane", cls=EmaneNode)
|
||||
emane_node.setposition(x=80, y=50)
|
||||
|
||||
# set the emane model
|
||||
core_emane.set_emane_model(emane_node, EmaneRfPipeModel)
|
||||
core.set_emane_model(emane_node, EmaneRfPipeModel)
|
||||
|
||||
# create nodes
|
||||
core_emane.create_node("n1", objid=1, position=(150, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core_emane.create_node("n2", objid=2, position=(300, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core.create_node("n1", objid=1, position=(150, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core.create_node("n2", objid=2, position=(300, 150), services=EMANE_SERVICES, model="mdr")
|
||||
|
||||
# add interfaces to nodes
|
||||
core_emane.add_interface(emane_node, "n1")
|
||||
core_emane.add_interface(emane_node, "n2")
|
||||
core.add_interface(emane_node, "n1")
|
||||
core.add_interface(emane_node, "n2")
|
||||
|
||||
# instantiate session
|
||||
core_emane.session.instantiate()
|
||||
core.session.instantiate()
|
||||
|
||||
# assert node directories created
|
||||
core_emane.assert_nodes()
|
||||
core.assert_nodes()
|
||||
|
||||
# ping n2 from n1 and assert success
|
||||
status = core_emane.ping("n1", "n2")
|
||||
status = core.ping("n1", "n2")
|
||||
assert not status
|
||||
|
||||
def test_commeffect(self, core_emane):
|
||||
def test_commeffect(self, core):
|
||||
"""
|
||||
Test emane 80211 model.
|
||||
|
||||
|
@ -84,11 +84,11 @@ class TestGui:
|
|||
"""
|
||||
|
||||
# create emane node for networking the core nodes
|
||||
emane_node = core_emane.session.add_object(name="emane", cls=EmaneNode)
|
||||
emane_node = core.session.add_object(name="emane", cls=EmaneNode)
|
||||
emane_node.setposition(x=80, y=50)
|
||||
|
||||
# set the emane model
|
||||
core_emane.set_emane_model(emane_node, EmaneCommEffectModel)
|
||||
core.set_emane_model(emane_node, EmaneCommEffectModel)
|
||||
|
||||
# configure emane to enable default connectivity
|
||||
config_data = ConfigData(
|
||||
|
@ -98,27 +98,27 @@ class TestGui:
|
|||
data_types=(11,),
|
||||
data_values="defaultconnectivitymode=1"
|
||||
)
|
||||
EmaneCommEffectModel.configure_emane(core_emane.session, config_data)
|
||||
EmaneCommEffectModel.configure_emane(core.session, config_data)
|
||||
|
||||
# create nodes
|
||||
core_emane.create_node("n1", objid=1, position=(150, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core_emane.create_node("n2", objid=2, position=(300, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core.create_node("n1", objid=1, position=(150, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core.create_node("n2", objid=2, position=(300, 150), services=EMANE_SERVICES, model="mdr")
|
||||
|
||||
# add interfaces to nodes
|
||||
core_emane.add_interface(emane_node, "n1")
|
||||
core_emane.add_interface(emane_node, "n2")
|
||||
core.add_interface(emane_node, "n1")
|
||||
core.add_interface(emane_node, "n2")
|
||||
|
||||
# instantiate session
|
||||
core_emane.session.instantiate()
|
||||
core.session.instantiate()
|
||||
|
||||
# assert node directories created
|
||||
core_emane.assert_nodes()
|
||||
core.assert_nodes()
|
||||
|
||||
# ping n2 from n1 and assert success
|
||||
status = core_emane.ping("n1", "n2")
|
||||
status = core.ping("n1", "n2")
|
||||
assert not status
|
||||
|
||||
def test_bypass(self, core_emane):
|
||||
def test_bypass(self, core):
|
||||
"""
|
||||
Test emane 80211 model.
|
||||
|
||||
|
@ -126,26 +126,26 @@ class TestGui:
|
|||
"""
|
||||
|
||||
# create emane node for networking the core nodes
|
||||
emane_node = core_emane.session.add_object(name="emane", cls=EmaneNode)
|
||||
emane_node = core.session.add_object(name="emane", cls=EmaneNode)
|
||||
emane_node.setposition(x=80, y=50)
|
||||
|
||||
# set the emane model
|
||||
core_emane.set_emane_model(emane_node, EmaneBypassModel)
|
||||
core.set_emane_model(emane_node, EmaneBypassModel)
|
||||
|
||||
# create nodes
|
||||
core_emane.create_node("n1", objid=1, position=(150, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core_emane.create_node("n2", objid=2, position=(300, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core.create_node("n1", objid=1, position=(150, 150), services=EMANE_SERVICES, model="mdr")
|
||||
core.create_node("n2", objid=2, position=(300, 150), services=EMANE_SERVICES, model="mdr")
|
||||
|
||||
# add interfaces to nodes
|
||||
core_emane.add_interface(emane_node, "n1")
|
||||
core_emane.add_interface(emane_node, "n2")
|
||||
core.add_interface(emane_node, "n1")
|
||||
core.add_interface(emane_node, "n2")
|
||||
|
||||
# instantiate session
|
||||
core_emane.session.instantiate()
|
||||
core.session.instantiate()
|
||||
|
||||
# assert node directories created
|
||||
core_emane.assert_nodes()
|
||||
core.assert_nodes()
|
||||
|
||||
# ping n2 from n1 and assert success
|
||||
status = core_emane.ping("n1", "n2")
|
||||
status = core.ping("n1", "n2")
|
||||
assert not status
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue