bug 1092 fixing deletion of items referenced by several projects

[osm/NBI.git] / osm_nbi / tests / test_descriptor_topics.py

diff --git a/osm_nbi/tests/test_descriptor_topics.py b/osm_nbi/tests/test_descriptor_topics.py
index d012ac9..3853f76 100755 (executable)
--- a/osm_nbi/tests/test_descriptor_topics.py
+++ b/osm_nbi/tests/test_descriptor_topics.py
@@ -85,6 +85,7 @@ class Test_VnfdTopic(TestCase):
         self.msg = Mock(msgbase.MsgBase())
         self.auth = Mock(authconn.Authconn(None, None, None))
         self.topic = VnfdTopic(self.db, self.fs, self.msg, self.auth)
+        self.topic.check_quota = Mock(return_value=None)  # skip quota
 
     def test_new_vnfd(self):
         did = db_vnfd_content["_id"]
@@ -509,8 +510,9 @@ class Test_VnfdTopic(TestCase):
             self.assertEqual(db_s1_args[0][1]["_id"], did, "Wrong DB ID")
             self.assertIn(p_id, db_s1_args[0][1]["_admin.projects_write.cont"], "Wrong DB filter")
             self.assertIsNone(db_s1_args[1]["update_dict"], "Wrong DB update dictionary")
-            self.assertIn("_admin.projects_read." + p_id, db_s1_args[1]["pull"], "Wrong DB pull dictionary")
-            self.assertIn("_admin.projects_write." + p_id, db_s1_args[1]["pull"], "Wrong DB pull dictionary")
+            self.assertEqual(db_s1_args[1]["pull_list"],
+                             {"_admin.projects_read": (p_id,), "_admin.projects_write": (p_id,)},
+                             "Wrong DB pull_list dictionary")
             self.fs.file_delete.assert_not_called()
         return
 
@@ -531,6 +533,7 @@ class Test_NsdTopic(TestCase):
         self.msg = Mock(msgbase.MsgBase())
         self.auth = Mock(authconn.Authconn(None, None, None))
         self.topic = NsdTopic(self.db, self.fs, self.msg, self.auth)
+        self.topic.check_quota = Mock(return_value=None)  # skip quota
 
     def test_new_nsd(self):
         did = db_nsd_content["_id"]
@@ -839,8 +842,9 @@ class Test_NsdTopic(TestCase):
             self.assertEqual(db_s1_args[0][1]["_id"], did, "Wrong DB ID")
             self.assertIn(p_id, db_s1_args[0][1]["_admin.projects_write.cont"], "Wrong DB filter")
             self.assertIsNone(db_s1_args[1]["update_dict"], "Wrong DB update dictionary")
-            self.assertIn("_admin.projects_read." + p_id, db_s1_args[1]["pull"], "Wrong DB pull dictionary")
-            self.assertIn("_admin.projects_write." + p_id, db_s1_args[1]["pull"], "Wrong DB pull dictionary")
+            self.assertEqual(db_s1_args[1]["pull_list"],
+                             {"_admin.projects_read": (p_id,), "_admin.projects_write": (p_id,)},
+                             "Wrong DB pull_list dictionary")
             self.fs.file_delete.assert_not_called()
         return