Optimize test cases

Issue-ID: VFC-1429
Signed-off-by: Olivia.Zhan <zhan.jie1@zte.com.cn>
Change-Id: I64429140f20e8db7140d3160d22299569696b339

diff --git a/catalog/packages/tests/test_ns_descriptor.py b/catalog/packages/tests/test_ns_descriptor.py
index 2f4e035..473786e 100644 (file)
--- a/catalog/packages/tests/test_ns_descriptor.py
+++ b/catalog/packages/tests/test_ns_descriptor.py
@@ -218,9 +218,9 @@ class TestNsDescriptor(TestCase):
         )
         file_content = ""
         for data in response.streaming_content:
-            file_content = '%s%s' % (file_content, data)
+            file_content = '%s%s' % (file_content, data.decode())
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual("b'test1test2'", file_content)
+        self.assertEqual("test1test2", file_content)
         os.remove('nsd_content.txt')
 
     def test_nsd_content_download_when_ns_not_exist(self):
@@ -253,9 +253,9 @@ class TestNsDescriptor(TestCase):
         )
         partial_file_content = ''
         for data in response.streaming_content:
-            partial_file_content = '%s%s' % (partial_file_content, data)
+            partial_file_content = '%s%s' % (partial_file_content, data.decode())
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual("b'test2'", partial_file_content)
+        self.assertEqual("test2", partial_file_content)
         os.remove('nsd_content.txt')
 
     @mock.patch.object(NsDescriptor, 'create')

diff --git a/catalog/packages/tests/test_pnf_descriptor.py b/catalog/packages/tests/test_pnf_descriptor.py
index 68fad6c..8af8614 100644 (file)
--- a/catalog/packages/tests/test_pnf_descriptor.py
+++ b/catalog/packages/tests/test_pnf_descriptor.py
@@ -213,9 +213,9 @@ class TestPnfDescriptor(TestCase):
         resp = self.client.get("/api/nsd/v1/pnf_descriptors/22/pnfd_content")
         file_content = ""
         for data in resp.streaming_content:
-            file_content = '%s%s' % (file_content, data)
+            file_content = '%s%s' % (file_content, data.decode())
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual("b'test1test2'", file_content)
+        self.assertEqual("test1test2", file_content)
         os.remove('pnfd_content.txt')
 
     def test_pnfd_download_failed(self):

diff --git a/catalog/packages/tests/test_vnf_package.py b/catalog/packages/tests/test_vnf_package.py
index 5ff3ff4..b83268a 100644 (file)
--- a/catalog/packages/tests/test_vnf_package.py
+++ b/catalog/packages/tests/test_vnf_package.py
@@ -256,9 +256,9 @@ class TestVnfPackage(TestCase):
         response = self.client.get("/api/vnfpkgm/v1/vnf_packages/222/package_content", HTTP_RANGE="4-7")
         partial_file_content = ''
         for data in response.streaming_content:
-            partial_file_content = partial_file_content.encode() + data
+            partial_file_content = partial_file_content + data.decode()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(b'BBB', partial_file_content)
+        self.assertEqual('BBB', partial_file_content)
         os.remove("vnfPackage.csar")
 
     def test_fetch_last_partical_vnf_pkg(self):
@@ -272,9 +272,9 @@ class TestVnfPackage(TestCase):
         response = self.client.get("/api/vnfpkgm/v1/vnf_packages/222/package_content", HTTP_RANGE=" 4-")
         partial_file_content = ''
         for data in response.streaming_content:
-            partial_file_content = partial_file_content.encode() + data
+            partial_file_content = partial_file_content + data.decode()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(b'BBBBCCCCDDDD', partial_file_content)
+        self.assertEqual('BBBBCCCCDDDD', partial_file_content)
         os.remove("vnfPackage.csar")
 
     def test_fetch_vnf_pkg_when_pkg_not_exist(self):