From a48036b353edae63f4517517569045e3b4ca97e1 Mon Sep 17 00:00:00 2001
From: "Blake J. Harnden" <bharnden@users.noreply.github.com>
Date: Tue, 27 Mar 2018 23:38:34 -0700
Subject: [PATCH] updated emane tests, all currently working
---
daemon/tests/test_emane.py | 30 +++++++-----------------------
1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/daemon/tests/test_emane.py b/daemon/tests/test_emane.py
index ebd8cd1b..6c7ade45 100644
--- a/daemon/tests/test_emane.py
+++ b/daemon/tests/test_emane.py
@@ -15,30 +15,18 @@ from core.emane.rfpipe import EmaneRfPipeModel
from core.emane.tdma import EmaneTdmaModel
-def setup_commeffect(session, emane_node):
- # configure emane to enable default connectivity
- config_data = ConfigData(
- node=emane_node.objid,
- object="emane_commeffect",
- type=2,
- data_types=(11,),
- data_values="defaultconnectivitymode=1"
- )
- EmaneCommEffectModel.configure_emane(session, config_data)
-
-
_EMANE_MODELS = [
- (EmaneIeee80211abgModel, None),
- (EmaneRfPipeModel, None),
- (EmaneBypassModel, None),
- (EmaneCommEffectModel, setup_commeffect),
- (EmaneTdmaModel, None),
+ EmaneIeee80211abgModel,
+ EmaneRfPipeModel,
+ EmaneBypassModel,
+ EmaneCommEffectModel,
+ EmaneTdmaModel,
]
class TestEmane:
- @pytest.mark.parametrize("model,setup", _EMANE_MODELS)
- def test_models(self, core, model, setup):
+ @pytest.mark.parametrize("model", _EMANE_MODELS)
+ def test_models(self, core, model):
"""
Test emane models within a basic network.
@@ -54,10 +42,6 @@ class TestEmane:
# set the emane model
core.set_emane_model(emane_node, model)
- # run setup method, if needed
- if setup:
- setup(core.session, emane_node)
-
# create nodes
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")