diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-04-02 08:28:12 +0000 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2019-04-02 08:28:12 +0000 |
| commit | feec0bcd53f24b0383f9f2db3a7837fa08525947 (patch) | |
| tree | 3d8bd59c4cad6c2926735198e73634969b9aee2b /windriver | |
| parent | 3176e57da097f2c238b134f18b1a4af00e105546 (diff) | |
Refactor helper codes
Move helper thread to common module
Refactor the interface between helper thread and worker
Change-Id: I0b61a2ed1a428f67cfbe3cc1411ace39e245932d
Issue-ID: MULTICLOUD-554
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'windriver')
| -rw-r--r-- | windriver/titanium_cloud/registration/tests/test_registration.py | 2 | ||||
| -rw-r--r-- | windriver/titanium_cloud/registration/tests/test_registration2.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/windriver/titanium_cloud/registration/tests/test_registration.py b/windriver/titanium_cloud/registration/tests/test_registration.py index 749fba62..49df5b23 100644 --- a/windriver/titanium_cloud/registration/tests/test_registration.py +++ b/windriver/titanium_cloud/registration/tests/test_registration.py @@ -271,7 +271,7 @@ class TestRegistration(test_base.TestRequest): "registry"), "{}", content_type="application/json", HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) - self.assertEquals(status.HTTP_500_INTERNAL_SERVER_ERROR, + self.assertEquals(status.HTTP_204_NO_CONTENT, response.status_code) @mock.patch.object(VimDriverUtils, 'get_session') diff --git a/windriver/titanium_cloud/registration/tests/test_registration2.py b/windriver/titanium_cloud/registration/tests/test_registration2.py index 495b2126..e00c6adc 100644 --- a/windriver/titanium_cloud/registration/tests/test_registration2.py +++ b/windriver/titanium_cloud/registration/tests/test_registration2.py @@ -87,10 +87,10 @@ class TestRegistration2(unittest.TestCase): ["get"], {"get": { "content": MOCK_GET_FLAVOR_RESPONSE}}), - resp = self.view.register_helper._discover_flavors(vimid="windriver-hudson-dc_RegionOne", + retcode, content = self.view.register_helper._discover_flavors(vimid="windriver-hudson-dc_RegionOne", session=mock_session, viminfo=MOCK_VIM_INFO) - self.assertIsNone(resp) + self.assertEquals(retcode, 11) def test_discover_flavors_w_hpa_numa(self): restcall.req_to_aai = mock.Mock() @@ -102,7 +102,7 @@ class TestRegistration2(unittest.TestCase): "content": MOCK_GET_FLAVOR_EXTRASPECS_RESPONSE_w_hpa_numa} ]}), - resp = self.view.register_helper._discover_flavors(vimid="windriver-hudson-dc_RegionOne", + retcode, content = self.view.register_helper._discover_flavors(vimid="windriver-hudson-dc_RegionOne", session=mock_session, viminfo=MOCK_VIM_INFO) - self.assertIsNone(resp) + self.assertEquals(retcode, 11) |