Code Review
/
modeling
/
etsicatalog.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
..
fd229ec
100644
(file)
--- a/
catalog/packages/tests/test_vnf_pkg_subscription.py
+++ b/
catalog/packages/tests/test_vnf_pkg_subscription.py
@@
-148,20
+148,16
@@
class TestNfPackageSubscription(TestCase):
self.assertEqual(temp_uuid, response.data["id"])
@mock.patch("requests.get")
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_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(
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)
format='json'
)
self.assertEqual(404, response.status_code)
@@
-186,9
+182,7
@@
class TestNfPackageSubscription(TestCase):
response = self.client.delete("/api/vnfpkgm/v1/subscriptions/%s" % temp_uuid)
self.assertEqual(204, response.status_code)
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)
dummy_uuid = str(uuid.uuid4())
response = self.client.delete("/api/vnfpkgm/v1/subscriptions/%s" % dummy_uuid)
self.assertEqual(404, response.status_code)