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/steps/sync_container.py b/lib/xos-synchronizer/tests/steps/sync_container.py
index baf108f..8cbabcb 100644
--- a/lib/xos-synchronizer/tests/steps/sync_container.py
+++ b/lib/xos-synchronizer/tests/steps/sync_container.py
@@ -21,7 +21,6 @@
import time
from xossynchronizer.steps.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
from xossynchronizer.steps.syncstep import DeferredException
-from xossynchronizer.mock_modelaccessor import *
# hpclibrary will be in steps/..
parentdir = os.path.join(os.path.dirname(__file__), "..")
@@ -29,19 +28,18 @@
class SyncContainer(SyncInstanceUsingAnsible):
- provides = [Instance]
- observes = Instance
+ observes = "Instance"
template_name = "sync_container.yaml"
def __init__(self, *args, **kwargs):
super(SyncContainer, self).__init__(*args, **kwargs)
def fetch_pending(self, deletion=False):
- i = Instance()
+ i = self.model_accessor.Instance()
i.name = "Spectacular Sponge"
- j = Instance()
+ j = self.model_accessor.Instance()
j.name = "Spontaneous Tent"
- k = Instance()
+ k = self.model_accessor.Instance()
k.name = "Embarrassed Cat"
objs = [i, j, k]