aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaopeng zhang <zhang.maopeng1@zte.com.cn>2020-02-20 01:29:24 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-20 01:29:24 +0000
commit0eaa773364c415f946860fef6f69f1fcda414178 (patch)
tree7461c2349c9c2a4fd1e21d57229618c43f59c1f5
parentf173f592ed958f55d992c109553760e3fb12628a (diff)
parenta8aae3166f06b86a609182b671d0e9a6ae314b44 (diff)
Merge "update test cases if subscription does not exist"
-rw-r--r--catalog/packages/tests/test_vnf_pkg_subscription.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/catalog/packages/tests/test_vnf_pkg_subscription.py b/catalog/packages/tests/test_vnf_pkg_subscription.py
index a8fd5d5..ab90299 100644
--- a/catalog/packages/tests/test_vnf_pkg_subscription.py
+++ b/catalog/packages/tests/test_vnf_pkg_subscription.py
@@ -149,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)
@@ -187,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)