From 77c7bf798ecdd1ec07b8d0ec2ada99e76abd26ce Mon Sep 17 00:00:00 2001
From: Blake Harnden <32446120+bharnden@users.noreply.github.com>
Date: Fri, 25 Oct 2019 15:32:12 -0700
Subject: [PATCH] changes to tests to fix session fixture not being master and
 updated emane xml config test to use a valid value

---
 daemon/tests/conftest.py         |  3 +++
 daemon/tests/emane/test_emane.py | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/daemon/tests/conftest.py b/daemon/tests/conftest.py
index 0c60bb2f..e1f04f66 100644
--- a/daemon/tests/conftest.py
+++ b/daemon/tests/conftest.py
@@ -12,6 +12,7 @@ from mock.mock import MagicMock
 from core.api.grpc.client import InterfaceHelper
 from core.api.grpc.server import CoreGrpcServer
 from core.api.tlv.corehandlers import CoreHandler
+from core.emane.emanemanager import EmaneManager
 from core.emulator.coreemu import CoreEmu
 from core.emulator.distributed import DistributedServer
 from core.emulator.emudata import IpPrefixes
@@ -58,6 +59,7 @@ def patcher(request):
         patch_manager.patch_obj(CoreNode, "nodefile")
         patch_manager.patch_obj(Session, "write_state")
         patch_manager.patch_obj(Session, "write_nodes")
+        patch_manager.patch_obj(EmaneManager, "buildxml")
     yield patch_manager
     patch_manager.shutdown()
 
@@ -73,6 +75,7 @@ def global_coreemu(patcher):
 def global_session(request, patcher, global_coreemu):
     mkdir = not request.config.getoption("mock")
     session = Session(1000, {"emane_prefix": "/usr"}, mkdir)
+    session.master = True
     yield session
     session.shutdown()
 
diff --git a/daemon/tests/emane/test_emane.py b/daemon/tests/emane/test_emane.py
index a27e8d83..4c507eee 100644
--- a/daemon/tests/emane/test_emane.py
+++ b/daemon/tests/emane/test_emane.py
@@ -93,7 +93,11 @@ class TestEmane:
         options = NodeOptions()
         options.set_position(80, 50)
         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
         options = NodeOptions(model="mdr")
@@ -138,11 +142,11 @@ class TestEmane:
 
         # retrieve configuration we set originally
         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
         assert session.get_node(n1_id)
         assert session.get_node(n2_id)
         assert session.get_node(emane_id)
-        assert value == "1"
+        assert value == config_value