Fix UT mismatch after fixing the tenants issue

Change-Id: Ie563de7f80c84c3eaed64589ec6e6250d80a31b6
Issue-ID: MULTICLOUD-657
Signed-off-by: Bin Yang <bin.yang@windriver.com>

diff --git a/newton/newton/requests/tests/test_image.py b/newton/newton/requests/tests/test_image.py
index c32ccd5..0a4f05c 100644 (file)
--- a/newton/newton/requests/tests/test_image.py
+++ b/newton/newton/requests/tests/test_image.py
@@ -22,7 +22,7 @@ from rest_framework import status
 from newton_base.tests import mock_info
 from newton_base.tests import test_base
 from newton_base.tests.test_base import AbstractTestResource
-from newton_base.openoapi.image import imageThread
+from newton_base.openoapi.image import ImageThread
 from newton_base.util import VimDriverUtils
 
 
@@ -70,7 +70,7 @@ class TestImageNewton(unittest.TestCase, AbstractTestResource):
 
         self.HTTP_not_found = status.HTTP_404_NOT_FOUND
 
-    @mock.patch.object(imageThread, 'run')
+    @mock.patch.object(ImageThread, 'run')
     @mock.patch.object(urllib, 'request')
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')

diff --git a/share/common/msapi/helper.py b/share/common/msapi/helper.py
index de8852c..d45a729 100644 (file)
--- a/share/common/msapi/helper.py
+++ b/share/common/msapi/helper.py
@@ -286,7 +286,8 @@ class MultiCloudThreadHelper(object):
         # there is at least 1 copy of backlog item in either backlog or expired backlog
         # self.lock.acquire()
         backlogitem = self.backlog.get(backlog_id, None)
-        self.owner.expired_backlog[backlog_id] = backlogitem
+        # self.owner.expired_backlog[backlog_id] = backlogitem
+        self.expired_backlog[backlog_id] = backlogitem
         self.backlog.pop(backlog_id, None)
         # self.lock.release()