SEBA-405 Cleanup synchronizer imports of model_accessor to globals;
Move mock modelaccessor to /tmp;
Easier mock modelaccessor configuration
Change-Id: I67a17b9a72ea69f61d92206f1b520a11c2f18d80
diff --git a/lib/xos-synchronizer/tests/test_load.py b/lib/xos-synchronizer/tests/test_load.py
index 8f9813d..3802dd7 100644
--- a/lib/xos-synchronizer/tests/test_load.py
+++ b/lib/xos-synchronizer/tests/test_load.py
@@ -52,10 +52,12 @@
import xossynchronizer.backend
reload(xossynchronizer.backend)
- b = xossynchronizer.backend.Backend()
+ from xossynchronizer.modelaccessor import model_accessor
+
+ b = xossynchronizer.backend.Backend(model_accessor=model_accessor)
steps_dir = Config.get("steps_dir")
self.steps = b.load_sync_step_modules(steps_dir)
- self.synchronizer = xossynchronizer.event_loop.XOSObserver(self.steps)
+ self.synchronizer = xossynchronizer.event_loop.XOSObserver(self.steps, model_accessor)
def tearDown(self):
sys.path = self.sys_path_save
@@ -92,6 +94,9 @@
self.assertIn(
("ControllerSlice", ["SyncControllerSlices"]), model_to_step.items()
)
+ self.assertIn(
+ ("Port", ["SyncPort"]), model_to_step.items()
+ )
self.assertIn(("SiteRole", ["SyncRoles"]), model_to_step.items())
for k, v in model_to_step.items():
@@ -100,7 +105,13 @@
if not isinstance(observes, list):
observes = [observes]
- observed_names = [o.__name__ for o in observes]
+ observed_names = []
+ for o in observes:
+ if isinstance(o,str):
+ observed_names.append(o)
+ else:
+ observed_names.append(o.__name__)
+
self.assertIn(k, observed_names)