Fix changes from David.

Author: Frederick Ross

splunklib/client.py

@@ -113,7 +113,7 @@ class IncomparableException(Exception):
 class JobNotReadyException(Exception):
     pass
 
-class AmbiguousReference(ValueError):
+class AmbiguousReferenceException(ValueError):
     pass
 
 def trailing(template, *targets):
@@ -893,7 +893,7 @@ def __contains__(self, name):
             return True
         except KeyError:
             return False
-        except AmbiguousReference:
+        except AmbiguousReferenceException:
             return True
 
     def __getitem__(self, key):
@@ -954,7 +954,7 @@ def __getitem__(self, key):
             response = self.get(key, owner=ns.owner, app=ns.app)
             entries = self._load_list(response)
             if len(entries) > 1:
-                raise AmbiguousReference("Found multiple entities named '%s'; please specify a namespace." % key)
+                raise AmbiguousReferenceException("Found multiple entities named '%s'; please specify a namespace." % key)
             elif len(entries) == 0:
                 raise KeyError(key)
             else:
@@ -1521,7 +1521,7 @@ def __contains__(self, key):
             return True
         except KeyError:
             return False
-        except AmbiguousReference:
+        except AmbiguousReferenceException:
             return True
 
 

tests/test_index.py

@@ -57,13 +57,13 @@ def test_read(self):
 
     def test_disable(self):
         self.index.disable()
-        testlib.restart(self.service)
+        # testlib.restart(self.service)
         self.index.refresh()
         self.assertEqual(self.index['disabled'], '1')
 
     def test_enable(self):
         self.index.enable()
-        testlib.restart(self.service)
+        # testlib.restart(self.service)
         self.index.refresh()
         self.assertEqual(self.index['disabled'], '0')
 

tests/test_saved_search.py

@@ -196,11 +196,7 @@ def test_dispatch(self):
         job = saved_search.dispatch()
         while not job.isReady():
             pass
-        try:
-            job.preview().close()
-        except ValueError:
-            pass # Probably not in a state that we can actually get
-                 # events from yet.
+        job.preview().close()
         job.cancel()
 
         # Dispatch with some additional options
@@ -239,27 +235,31 @@ def contains(history, sid):
             return sid in [job.sid for job in history]
 
         job1 = saved_search.dispatch()
-        sleep(1)
+        while not job1.isReady():
+            sleep(1)
         history = saved_search.history()
         self.assertEqual(len(history), 1)
         self.assertTrue(contains(history, job1.sid))
 
         job2 = saved_search.dispatch()
-        sleep(1)
+        while not job2.isReady():
+            sleep(1)
         history = saved_search.history()
         self.assertEqual(len(history), 2)
         self.assertTrue(contains(history, job1.sid))
         self.assertTrue(contains(history, job2.sid))
 
         job1.cancel()
-        sleep(1)
+        while job1.sid in service.jobs:
+            sleep(1)
         history = saved_search.history()
         self.assertEqual(len(history), 1)
         self.assertFalse(contains(history, job1.sid))
         self.assertTrue(contains(history, job2.sid))
 
         job2.cancel()
-        sleep(1)
+        while job2.sid in service.jobs:
+            sleep(1)
         history = saved_search.history()
         self.assertEqual(len(history), 0)
         self.assertFalse(contains(history, job1.sid))