Fixed several failing tests by improving __contains__; added workaround for an error in the returns of fired alerts.

__contains__ had used __getitem__, but the confs endpoints make that untenable: they return collections, not entities, from __getitem__, which means they don't make a roundtrip to the server to check for actual existence. I also had to add handling of atom feeds containing no entries to __contains__ and __getitem__ so that it would work for fired alerts, which return empty atom feeds instead of 404s if the alert doesn't exist.

Author: Frederick Ross

splunklib/client.py

@@ -844,18 +844,26 @@ def __init__(self, service, path, item=Entity):
         self.item = item # Item accessor
         self.null_count = -1
 
-
     def __contains__(self, name):
         """Is there at least one entry called *name* in this collection?
 
         Makes a single roundtrip to the server, plus at most two more
         if autologin is enabled.
         """
         try:
-            self[name]
-            return True
-        except KeyError:
-            return False
+            response = self.get(name)
+            entries = self._load_list(response)
+            if len(entries) == 0:
+                # We need this because in 4.2 and 4.3,
+                # fired alerts return an empty feed instead of 404.
+                return False 
+            else:
+                return True
+        except HTTPError as he:
+            if he.status == 404:
+                return False
+            else:
+                raise
 
     def __getitem__(self, key):
         """Fetch an item named *key* from this collection.
@@ -916,6 +924,8 @@ def __getitem__(self, key):
             entries = self._load_list(response)
             if len(entries) > 1:
                 raise ValueError("Found multiple entities named '%s'; please specify a namespace." % key)
+            elif len(entries) == 0:
+                raise KeyError(key)
             else:
                 return entries[0]
         except HTTPError as he: