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_run.py b/lib/xos-synchronizer/tests/test_run.py
index f5815f2..65651d9 100644
--- a/lib/xos-synchronizer/tests/test_run.py
+++ b/lib/xos-synchronizer/tests/test_run.py
@@ -14,10 +14,7 @@
import json
import unittest
-from mock import patch
import mock
-import pdb
-import networkx as nx
import os
import sys
@@ -70,10 +67,12 @@
for (k, v) in model_accessor.all_model_classes.items():
globals()[k] = v
- 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)
try:
os.remove("/tmp/sync_ports")
except OSError:
@@ -88,12 +87,10 @@
os.chdir(self.cwd_save)
@mock.patch(
- "steps.sync_instances.syncstep.run_template",
+ "steps.sync_instances.ansiblesyncstep.run_template",
side_effect=run_fake_ansible_template,
)
- @mock.patch("xossynchronizer.event_loop.model_accessor")
- def test_run_once(self, mock_run_template, mock_accessor, *_other_accessors):
-
+ def test_run_once(self, mock_run_template):
pending_objects, pending_steps = self.synchronizer.fetch_pending()
pending_objects2 = list(pending_objects)