GH#151: delete(id=<list>) assumed no parent/child docs

Rearrange the multiple-id delete() test code according to the new default
document test set.

Chose to filter out the parent/child documents from this specific part of the
test, under the assumption that Solr will behave correctly whether the id
to be deleted belongs to a leaf, parent, child or grandchild document.

The test code should be generic enough to not need modifications when
the document test set (self.docs) is expanded.

Author: Cosimo Streppone

tests/test_client.py

@@ -655,26 +655,35 @@ def test_delete(self):
         self.solr.delete(q='*:*')
         self.assertEqual(len(self.solr.search('*:*')), 0)
 
-        # Try delete with a list of document ids
-        self.solr.add(self.docs)
+        # Test delete() with `id' being a list.
+        # Solr's ability to delete parent/children docs by id is simply assumed
+        # and not what's under test here.
+        def leaf_doc(doc):
+            return 'price' in doc and NESTED_DOC_KEY not in doc
+
+        to_delete_docs = filter(leaf_doc, self.docs)
+        to_delete_ids = [doc['id'] for doc in to_delete_docs]
+
+        self.solr.add(to_delete_docs)
         self.solr.commit()
-        self.assertEqual(len(self.solr.search('*:*')), len(self.docs))
-        to_delete = [doc['id'] for doc in self.docs]
-        # Extract a random document from the list, to later check it wasn't deleted
-        graced_doc_id = to_delete.pop(random.randint(0, len(to_delete) - 1))
-        self.solr.delete(id=to_delete)
+
+        leaf_q = 'price:[* TO *]'
+        self.assertEqual(len(self.solr.search(leaf_q)), len(to_delete_docs))
+        # Extract a random doc from the list, to later check it wasn't deleted.
+        graced_doc_id = to_delete_ids.pop(random.randint(0, len(to_delete_ids) - 1))
+        self.solr.delete(id=to_delete_ids)
         # There should be only one left, our graced id
-        self.assertEqual(len(self.solr.search('*:*')), 1)
+        self.assertEqual(len(self.solr.search(leaf_q)), 1)
         self.assertEqual(len(self.solr.search('id:%s' % graced_doc_id)), 1)
         # Now we can wipe the graced document too. None should be left.
         self.solr.delete(id=graced_doc_id)
-        self.assertEqual(len(self.solr.search('*:*')), 0)
+        self.assertEqual(len(self.solr.search(leaf_q)), 0)
 
         # Can't delete when the list of documents is empty
         self.assertRaises(ValueError, self.solr.delete, id=[None, None, None])
         self.assertRaises(ValueError, self.solr.delete, id=[None])
 
-        # Need at least one.
+        # Need at least one of either `id' or `q'
         self.assertRaises(ValueError, self.solr.delete)
         # Can't have both.
         self.assertRaises(ValueError, self.solr.delete, id='foo', q='bar')