Fix restcall bug of decode http response content

[multicloud/framework.git] / multivimbroker / multivimbroker / tests / test_restcall.py

diff --git a/multivimbroker/multivimbroker/tests/test_restcall.py b/multivimbroker/multivimbroker/tests/test_restcall.py
index 2052208..aff2670 100644 (file)
--- a/multivimbroker/multivimbroker/tests/test_restcall.py
+++ b/multivimbroker/multivimbroker/tests/test_restcall.py
@@ -18,8 +18,8 @@ class TestRestCall(unittest.TestCase):
 
     def test_combine_url(self):
         url = ["http://a.com/test/", "http://a.com/test/",
-               "http://a.com/test"]
-        res = ["/resource", "resource", "/resource"]
+               "http://a.com/test", "http://a.com/test"]
+        res = ["/resource", "resource", "/resource", "resource"]
         expected = "http://a.com/test/resource"
         for i in range(len(url)):
             self.assertEqual(expected, restcall.combine_url(url[i], res[i]))
@@ -49,7 +49,7 @@ class TestRestCall(unittest.TestCase):
         content = "no content"
         headers = None
         restcall.req_by_msb(res, method, content=content, headers=headers)
-        expect_url = "http://127.0.0.1:10080/"
+        expect_url = "http://msb.onap.org:10080/"
         mock_call.assert_called_once_with(
             expect_url, "", "", restcall.rest_no_auth, res, method,
             content, headers)
@@ -60,7 +60,7 @@ class TestRestCall(unittest.TestCase):
             "status": "200"
         }
         resp_content = "hello"
-        mock_req.return_value = mock_resp, resp_content
+        mock_req.return_value = mock_resp, resp_content.encode("utf-8")
         expect_ret = [0, resp_content, "200", mock_resp]
         ret = restcall.call_req("http://onap.org/", "user", "pass",
                                 restcall.rest_no_auth, "vim", "GET")