Update python2 to python3

[modeling/etsicatalog.git] / genericparser / packages / tests / test_pnf_descriptor.py

diff --git a/genericparser/packages/tests/test_pnf_descriptor.py b/genericparser/packages/tests/test_pnf_descriptor.py
index fc32bbe..770d74b 100644 (file)
--- a/genericparser/packages/tests/test_pnf_descriptor.py
+++ b/genericparser/packages/tests/test_pnf_descriptor.py
@@ -76,7 +76,9 @@ class TestPnfDescriptor(TestCase):
         )
         response.data.pop('id')
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-        self.assertEqual(expected_reponse_data, response.data)
+        # self.assertEqual(expected_reponse_data, response.data)
+        for key, value in expected_reponse_data.items():
+            self.assertEqual(response.data[key], value)
 
     def test_query_multiple_pnfds_normal(self):
         expected_reponse_data = [
@@ -148,10 +150,10 @@ class TestPnfDescriptor(TestCase):
             userDefinedData=user_defined_data_json,
         ).save()
         mock_parse_pnfd.return_value = json.JSONEncoder().encode(pnfd_data)
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.write('test')
 
-        with open('pnfd_content.txt', 'rb') as fp:
+        with open('pnfd_content.txt', 'rt') as fp:
             resp = self.client.put(
                 "/api/nsd/v1/pnf_descriptors/22/pnfd_content",
                 {'file': fp},
@@ -164,10 +166,10 @@ class TestPnfDescriptor(TestCase):
         os.remove('pnfd_content.txt')
 
     def test_pnfd_content_upload_when_pnf_not_exist(self):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.write('test')
 
-        with open('pnfd_content.txt', 'rb') as fp:
+        with open('pnfd_content.txt', 'rt') as fp:
             resp = self.client.put(
                 "/api/nsd/v1/pnf_descriptors/22/pnfd_content",
                 {'file': fp},
@@ -176,7 +178,7 @@ class TestPnfDescriptor(TestCase):
 
     @mock.patch.object(toscaparsers, "parse_pnfd")
     def test_pnfd_content_upload_when_pnfd_exist(self, mock_parse_pnfd):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.write('test')
         PnfPackageModel(
             pnfPackageId='22',
@@ -189,7 +191,7 @@ class TestPnfDescriptor(TestCase):
             pnfdId="zte-1.0"
         ).save()
         mock_parse_pnfd.return_value = json.JSONEncoder().encode(pnfd_data)
-        with open('pnfd_content.txt', 'rb') as fp:
+        with open('pnfd_content.txt', 'rt') as fp:
             resp = self.client.put(
                 "/api/nsd/v1/pnf_descriptors/22/pnfd_content",
                 {'file': fp},
@@ -197,7 +199,7 @@ class TestPnfDescriptor(TestCase):
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     def test_pnfd_download_normal(self):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.writelines('test1')
             fp.writelines('test2')
         user_defined_data = json.JSONEncoder().encode(self.user_defined_data)
@@ -214,7 +216,7 @@ class TestPnfDescriptor(TestCase):
         for data in resp.streaming_content:
             file_content = '%s%s' % (file_content, data)
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual('test1test2', file_content)
+        self.assertEqual("b'test1test2'", file_content)
         os.remove('pnfd_content.txt')
 
     def test_pnfd_download_failed(self):
@@ -222,7 +224,7 @@ class TestPnfDescriptor(TestCase):
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_pnfd_download_when_not_on_boarded(self):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.writelines('test1')
             fp.writelines('test2')
         user_defined_data = json.JSONEncoder().encode(self.user_defined_data)