Merge "update test cases if subscription does not exist"

[modeling/etsicatalog.git] / catalog / packages / tests / test_vnf_pkg_subscription.py

diff --git a/catalog/packages/tests/test_vnf_pkg_subscription.py b/catalog/packages/tests/test_vnf_pkg_subscription.py
index d2e2b5b..ab90299 100644 (file)
--- a/catalog/packages/tests/test_vnf_pkg_subscription.py
+++ b/catalog/packages/tests/test_vnf_pkg_subscription.py
@@ -20,6 +20,7 @@ import mock
 from django.test import TestCase
 from rest_framework import status
 from rest_framework.test import APIClient
+from requests.auth import HTTPBasicAuth
 
 import catalog.pub.utils.timeutil
 from catalog.packages import const
@@ -148,20 +149,16 @@ class TestNfPackageSubscription(TestCase):
         self.assertEqual(temp_uuid, response.data["id"])
 
     @mock.patch("requests.get")
-    @mock.patch.object(uuid, 'uuid4')
-    def test_get_subscription_with_id_not_exists(self, mock_uuid4, mock_requests):
-        temp_uuid = "99442b18-a5c7-11e8-998c-bf1755941f13"
-        dummy_uuid = str(uuid.uuid4())
+    def test_get_subscription_with_id_not_exists(self, mock_requests):
         mock_requests.return_value.status_code = 204
         mock_requests.get.status_code = 204
-        mock_uuid4.return_value = temp_uuid
         self.client.post(
             "/api/vnfpkgm/v1/subscriptions",
             data=self.vnf_subscription_data,
             format='json'
         )
         response = self.client.get(
-            "/api/vnfpkgm/v1/subscriptions/%s" % dummy_uuid,
+            "/api/vnfpkgm/v1/subscriptions/111",
             format='json'
         )
         self.assertEqual(404, response.status_code)
@@ -186,9 +183,7 @@ class TestNfPackageSubscription(TestCase):
         response = self.client.delete("/api/vnfpkgm/v1/subscriptions/%s" % temp_uuid)
         self.assertEqual(204, response.status_code)
 
-    @mock.patch("requests.get")
-    @mock.patch.object(uuid, 'uuid4')
-    def test_delete_subscription_with_id_not_exists(self, mock_uuid4, mock_requests):
+    def test_delete_subscription_with_id_not_exists(self):
         dummy_uuid = str(uuid.uuid4())
         response = self.client.delete("/api/vnfpkgm/v1/subscriptions/%s" % dummy_uuid)
         self.assertEqual(404, response.status_code)
@@ -248,7 +243,7 @@ class TestNfPackageSubscription(TestCase):
             }
         }
         mock_requests_post.assert_called_with(vnf_subscription_data["callbackUri"], data=expect_notification,
-                                              headers={'Connection': 'close'})
+                                              headers={'Connection': 'close'}, auth=HTTPBasicAuth("admin", "pwd1234"))
 
     def test_service_query_single_subscription_not_found(self):
         try: