Merge branch 'apruneda/docs' into develop

Conflicts:
	docs/index.rst

Author: Frederick Ross

docs/index.rst

@@ -31,46 +31,81 @@ For more information about the SDK, see the `Developer Portal <http://dev.splunk
 
     **Entities and collections**
 
-    :class:`~splunklib.client.Entity` base class 
+    :class:`~splunklib.client.AlertGroup` class
 
-    :class:`~splunklib.client.Collection` base class 
+    :class:`~splunklib.client.Application` class
 
-    :class:`~splunklib.client.AlertGroup` class 
+    :class:`~splunklib.client.Collection` class
 
-    :class:`~splunklib.client.ConfigurationFile` class 
 
-    :class:`~splunklib.client.Configurations` class 
+    :class:`~splunklib.client.ConfigurationFile` class
 
-    :class:`~splunklib.client.Stanza` class 
+    :class:`~splunklib.client.Configurations` class
 
-    :class:`~splunklib.client.Index` class 
+    :class:`~splunklib.client.Entity` class
 
-    :class:`~splunklib.client.Input` class 
+    :class:`~splunklib.client.Index` class
 
-    :class:`~splunklib.client.Inputs` class 
+    :class:`~splunklib.client.Indexes` class
 
-    :class:`~splunklib.client.Job` class 
+    :class:`~splunklib.client.Input` class
 
-    :class:`~splunklib.client.Jobs` class 
+    :class:`~splunklib.client.Inputs` class
 
-    :class:`~splunklib.client.Loggers` class 
+    :class:`~splunklib.client.Job` class
 
-    :class:`~splunklib.client.Message` class 
+    :class:`~splunklib.client.Jobs` class
 
-    :class:`~splunklib.client.SavedSearch` class 
+    :class:`~splunklib.client.Loggers` class
 
-    :class:`~splunklib.client.SavedSearches` class 
+    :class:`~splunklib.client.Message` class
 
-    :class:`~splunklib.client.Settings` class 
+    :class:`~splunklib.client.ModularInputKind` class
 
-    :class:`~splunklib.client.Users` class 
+    :class:`~splunklib.client.ReadOnlyCollection` class
+
+    :class:`~splunklib.client.Role` class
+
+    :class:`~splunklib.client.Roles` class
+
+    :class:`~splunklib.client.SavedSearch` class
+
+    :class:`~splunklib.client.SavedSearches` class
+
+    :class:`~splunklib.client.Settings` class
+
+    :class:`~splunklib.client.Stanza` class
+
+    :class:`~splunklib.client.User` class
+
+    :class:`~splunklib.client.Users` class
 
     **Exceptions**
 
-    :class:`~splunklib.client.NotSupportedError` class 
+    :class:`~splunklib.client.AmbiguousReferenceException` class
+
+    :class:`~splunklib.client.EntityDeletedException` class
+
+    :class:`~splunklib.client.IllegalOperationException` class
+
+    :class:`~splunklib.client.IncomparableException` class
+
+    :class:`~splunklib.client.InvalidNameException` class
+
+    :class:`~splunklib.client.JobNotReadyException` class
+
+    :class:`~splunklib.client.NoSuchApplicationException` class
+
+    :class:`~splunklib.client.NoSuchCapability` class
+
+    :class:`~splunklib.client.NoSuchUserException` class
+
+    :class:`~splunklib.client.NotSupportedError` class
 
-    :class:`~splunklib.client.OperationError` class 
+    :class:`~splunklib.client.OperationError` class
 
+    :class:`~splunklib.client.OperationFailedException` class
+    
 
 :doc:`data`
 -----------

tests/test_fired_alert.py

@@ -25,8 +25,6 @@ def setUp(self):
         self.index_name = testlib.tmpname()
         self.assertFalse(self.index_name in self.service.indexes)
         self.index = self.service.indexes.create(self.index_name)
-        self.service.restart(120)
-        self.index = self.service.indexes[self.index_name]
         saved_searches = self.service.saved_searches
         self.saved_search_name = testlib.tmpname()
         self.assertFalse(self.saved_search_name in saved_searches)
@@ -45,6 +43,7 @@ def setUp(self):
 
     def tearDown(self):
         super(FiredAlertTestCase, self).tearDown()
+        self.service.indexes.delete(self.index_name)
         for saved_search in self.service.saved_searches:
             if saved_search.name.startswith('delete-me'):
                 self.service.saved_searches.delete(saved_search.name)
@@ -60,6 +59,8 @@ def test_new_search_is_empty(self):
     def test_alerts_on_events(self):
         self.assertEqual(self.saved_search.alert_count, 0)
         self.assertEqual(len(self.saved_search.fired_alerts), 0)
+        self.index.enable()
+        testlib.retry(self.index, 'disabled', '0', step=0.5, times=50)
         eventCount = int(self.index['totalEventCount'])
         self.assertEqual(self.index['sync'], '0')
         self.assertEqual(self.index['disabled'], '0')