afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

changes to tests to fix session fixture not being master and updated emane xml config test to use a valid value

Browse source
This commit is contained in:
Blake Harnden 2019-10-25 15:32:12 -07:00
parent 8e67294a8a
commit 77c7bf798e
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/tests/conftest.py
View file

@ -12,6 +12,7 @@ from mock.mock import MagicMock
from core.api.grpc.client import InterfaceHelper from core.api.grpc.client import InterfaceHelper
from core.api.grpc.server import CoreGrpcServer from core.api.grpc.server import CoreGrpcServer
from core.api.tlv.corehandlers import CoreHandler from core.api.tlv.corehandlers import CoreHandler
from core.emane.emanemanager import EmaneManager
from core.emulator.coreemu import CoreEmu from core.emulator.coreemu import CoreEmu
from core.emulator.distributed import DistributedServer from core.emulator.distributed import DistributedServer
from core.emulator.emudata import IpPrefixes from core.emulator.emudata import IpPrefixes
@ -58,6 +59,7 @@ def patcher(request):
patch_manager.patch_obj(CoreNode, "nodefile") patch_manager.patch_obj(CoreNode, "nodefile")
patch_manager.patch_obj(Session, "write_state") patch_manager.patch_obj(Session, "write_state")
patch_manager.patch_obj(Session, "write_nodes") patch_manager.patch_obj(Session, "write_nodes")
patch_manager.patch_obj(EmaneManager, "buildxml")
yield patch_manager yield patch_manager
patch_manager.shutdown() patch_manager.shutdown()
@ -73,6 +75,7 @@ def global_coreemu(patcher):
def global_session(request, patcher, global_coreemu): def global_session(request, patcher, global_coreemu):
mkdir = not request.config.getoption("mock") mkdir = not request.config.getoption("mock")
session = Session(1000, {"emane_prefix": "/usr"}, mkdir) session = Session(1000, {"emane_prefix": "/usr"}, mkdir)
session.master = True
yield session yield session
session.shutdown() session.shutdown()

10
daemon/tests/emane/test_emane.py
View file

@ -93,7 +93,11 @@ class TestEmane:
options = NodeOptions() options = NodeOptions()
options.set_position(80, 50) options.set_position(80, 50)
emane_network = session.add_node(_type=NodeTypes.EMANE, options=options) emane_network = session.add_node(_type=NodeTypes.EMANE, options=options)
session.emane.set_model(emane_network, EmaneIeee80211abgModel, {"test": "1"}) config_key = "txpower"
config_value = "10"
session.emane.set_model(
emane_network, EmaneIeee80211abgModel, {config_key: config_value}
)
# create nodes # create nodes
options = NodeOptions(model="mdr") options = NodeOptions(model="mdr")
@ -138,11 +142,11 @@ class TestEmane:
# retrieve configuration we set originally # retrieve configuration we set originally
value = str( value = str(
session.emane.get_config("test", emane_id, EmaneIeee80211abgModel.name) session.emane.get_config(config_key, emane_id, EmaneIeee80211abgModel.name)
) )
# verify nodes and configuration were restored # verify nodes and configuration were restored
assert session.get_node(n1_id) assert session.get_node(n1_id)
assert session.get_node(n2_id) assert session.get_node(n2_id)
assert session.get_node(emane_id) assert session.get_node(emane_id)
assert value == "1" assert value == config_value