From: maopeng zhang <zhang.maopeng1@zte.com.cn>
Date: Thu, 20 Feb 2020 01:29:24 +0000 (+0000)
Subject: Merge "update test cases if subscription does not exist"
X-Git-Tag: 1.0.5~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0eaa773364c415f946860fef6f69f1fcda414178;hp=-c;p=modeling%2Fetsicatalog.git

Merge "update test cases if subscription does not exist"
---

0eaa773364c415f946860fef6f69f1fcda414178
diff --combined catalog/packages/tests/test_vnf_pkg_subscription.py
index a8fd5d5,fd229ec..ab90299
--- a/catalog/packages/tests/test_vnf_pkg_subscription.py
+++ b/catalog/packages/tests/test_vnf_pkg_subscription.py
@@@ -20,7 -20,6 +20,7 @@@ import moc
  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
@@@ -149,20 -148,16 +149,16 @@@ class TestNfPackageSubscription(TestCas
          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)
@@@ -187,9 -182,7 +183,7 @@@
          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)
@@@ -249,7 -242,7 +243,7 @@@
              }
          }
          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: