X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tests%2Funit%2Ftest_watcher.py;h=806d20fe10605cac9fea6ffe13a30f31628832a2;hb=b37a7d8e36bd9fdf862cb1aad29f9a29052e725f;hp=69c3e91245672ca2c6838ffed1c77b6f49ee5be4;hpb=62f8863960ebd439c714b0ceed204731d9b31266;p=pti%2Fo2.git

diff --git a/tests/unit/test_watcher.py b/tests/unit/test_watcher.py
index 69c3e91..806d20f 100644
--- a/tests/unit/test_watcher.py
+++ b/tests/unit/test_watcher.py
@@ -15,23 +15,26 @@
 import time
 from datetime import datetime
 import json
-from typing import List
-from o2ims.service import handlers
-from o2ims.domain.resource_type import ResourceTypeEnum
-from o2ims.service.client.base_client import BaseClient
-from o2ims.domain import ocloud
-from o2ims import config
+from typing import Callable, List
+# from o2common.config import config
 import uuid
-from o2ims.service.watcher.base import BaseWatcher, WatcherTree
+from o2common.service.watcher.base import BaseWatcher, WatcherTree
+from o2common.service.watcher import worker
+from o2common.service.unit_of_work import AbstractUnitOfWork
+from o2common.service import messagebus
+
+from o2ims.domain.resource_type import ResourceTypeEnum
 from o2ims.domain import stx_object as ocloudModel
 from o2ims.adapter.ocloud_repository import OcloudRepository
 from o2ims.domain.stx_repo import StxObjectRepository
-from o2ims.service.watcher import worker
-from o2ims.service.unit_of_work import AbstractUnitOfWork
 from o2ims.service.watcher.ocloud_watcher import OcloudWatcher
-from o2ims.service import messagebus
-from o2ims import bootstrap
 from o2ims.domain import commands
+from o2common.service.client.base_client import BaseClient
+from o2ims.domain import ocloud
+
+from o2app.service import handlers
+from o2app import bootstrap
+
 
 class FakeOcloudClient(BaseClient):
     def __init__(self):
@@ -74,7 +77,6 @@ class FakeOcloudRepo(OcloudRepository):
         ocloud1.update_by(ocloud)
 
 
-
 class FakeStxObjRepo(StxObjectRepository):
     def __init__(self):
         super().__init__()
@@ -126,8 +128,9 @@ class FakeUnitOfWork(AbstractUnitOfWork):
 
 def create_fake_bus(uow):
     def update_ocloud(
-        cmd: commands.UpdateOCloud,
-        uow: AbstractUnitOfWork):
+            cmd: commands.UpdateOCloud,
+            uow: AbstractUnitOfWork,
+            publish: Callable):
         return
 
     fakeuow = FakeUnitOfWork()
@@ -166,7 +169,7 @@ def test_watchers_worker():
         def _targetname(self):
             return "fakeocloudwatcher"
 
-        def _probe(self, parent: object=None):
+        def _probe(self, parent: object = None):
             # import pdb; pdb.set_trace()
             self.fakeOcloudWatcherCounter += 1
             # hacking to stop the blocking sched task
@@ -174,7 +177,6 @@ def test_watchers_worker():
                 testedworker.stop()
             return []
 
-
     # fakeRepo = FakeOcloudRepo()
     fakeuow = FakeUnitOfWork()
     bus = create_fake_bus(fakeuow)