test case fix

Author: ashah-splunk

splunklib/client.py

@@ -1726,7 +1726,8 @@ def __getitem__(self, key):
         except HTTPError as he:
             if he.status == 404:  # No entity matching key
                 raise KeyError(key)
-            raise
+            else:
+                raise
 
     def __contains__(self, key):
         # configs/conf-{name} never returns a 404. We have to post to properties/{name}
@@ -2248,7 +2249,8 @@ def __getitem__(self, key):
                 except HTTPError as he:
                     if he.status == 404:
                         pass  # Just carry on to the next kind.
-                    raise
+                    else:
+                        raise
             if candidate is None:
                 raise KeyError(key)  # Never found a match.
             return candidate
@@ -2275,7 +2277,8 @@ def __contains__(self, key):
                 except HTTPError as he:
                     if he.status == 404:
                         pass  # Just carry on to the next kind.
-                    raise
+                    else:
+                        raise
             return False
 
     def create(self, name, kind, **kwargs):
@@ -2559,7 +2562,8 @@ def list(self, *kinds, **kwargs):
             except HTTPError as e:
                 if e.status == 404:
                     continue  # No inputs of this kind
-                raise
+                else:
+                    raise
 
             entries = _load_atom_entries(response)
             if entries is None: continue  # No inputs to process

tests/test_input.py

@@ -21,7 +21,6 @@
 from splunklib import client
 
 
-
 def highest_port(service, base_port, *kinds):
     """Find the first port >= base_port not in use by any input in kinds."""
     highest_port = base_port
@@ -45,7 +44,7 @@ def tearDown(self):
 
     def create_tcp_input(self, base_port, kind, **options):
         port = base_port
-        while True: # Find the next unbound port
+        while True:  # Find the next unbound port
             try:
                 input = self.service.inputs.create(str(port), kind, **options)
                 return input
@@ -66,7 +65,7 @@ def test_cannot_create_with_restrictToHost_in_name(self):
         )
 
     def test_create_tcp_ports_with_restrictToHost(self):
-        for kind in ['tcp', 'splunktcp']: # Multiplexed UDP ports are not supported
+        for kind in ['tcp', 'splunktcp']:  # Multiplexed UDP ports are not supported
             # Make sure we can create two restricted inputs on the same port
             boris = self.service.inputs.create(str(self.base_port), kind, restrictToHost='boris')
             natasha = self.service.inputs.create(str(self.base_port), kind, restrictToHost='natasha')
@@ -101,7 +100,7 @@ def test_unrestricted_to_restricted_collision(self):
             unrestricted.delete()
 
     def test_update_restrictToHost_fails(self):
-        for kind in ['tcp', 'splunktcp']: # No UDP, since it's broken in Splunk
+        for kind in ['tcp', 'splunktcp']:  # No UDP, since it's broken in Splunk
             boris = self.create_tcp_input(self.base_port, kind, restrictToHost='boris')
 
             self.assertRaises(
@@ -171,21 +170,22 @@ def test_oneshot(self):
 
         def f():
             index.refresh()
-            return int(index['totalEventCount']) == eventCount+4
+            return int(index['totalEventCount']) == eventCount + 4
+
         self.assertEventuallyTrue(f, timeout=60)
 
     def test_oneshot_on_nonexistant_file(self):
         name = testlib.tmpname()
         self.assertRaises(HTTPError,
-            self.service.inputs.oneshot, name)
+                          self.service.inputs.oneshot, name)
 
 
 class TestInput(testlib.SDKTestCase):
     def setUp(self):
         super().setUp()
         inputs = self.service.inputs
-        unrestricted_port = str(highest_port(self.service, 10000, 'tcp', 'splunktcp', 'udp')+1)
-        restricted_port = str(highest_port(self.service, int(unrestricted_port)+1, 'tcp', 'splunktcp')+1)
+        unrestricted_port = str(highest_port(self.service, 10000, 'tcp', 'splunktcp', 'udp') + 1)
+        restricted_port = str(highest_port(self.service, int(unrestricted_port) + 1, 'tcp', 'splunktcp') + 1)
         test_inputs = [{'kind': 'tcp', 'name': unrestricted_port, 'host': 'sdk-test'},
                        {'kind': 'udp', 'name': unrestricted_port, 'host': 'sdk-test'},
                        {'kind': 'tcp', 'name': 'boris:' + restricted_port, 'host': 'sdk-test'}]
@@ -223,7 +223,7 @@ def test_lists_modular_inputs(self):
         self.uncheckedRestartSplunk()
 
         inputs = self.service.inputs
-        if ('abcd','test2') not in inputs:
+        if ('abcd', 'test2') not in inputs:
             inputs.create('abcd', 'test2', field1='boris')
 
         input = inputs['abcd', 'test2']
@@ -268,19 +268,19 @@ def test_update(self):
     @pytest.mark.skip('flaky')
     def test_delete(self):
         inputs = self.service.inputs
-        remaining = len(self._test_entities)-1
+        remaining = len(self._test_entities) - 1
         for input_entity in self._test_entities.values():
             name = input_entity.name
             kind = input_entity.kind
             self.assertTrue(name in inputs)
-            self.assertTrue((name,kind) in inputs)
+            self.assertTrue((name, kind) in inputs)
             if remaining == 0:
                 inputs.delete(name)
                 self.assertFalse(name in inputs)
             else:
                 if not name.startswith('boris'):
                     self.assertRaises(client.AmbiguousReferenceException,
-                        inputs.delete, name)
+                                      inputs.delete, name)
                 self.service.inputs.delete(name, kind)
                 self.assertFalse((name, kind) in inputs)
             self.assertRaises(client.HTTPError,
@@ -290,4 +290,5 @@ def test_delete(self):
 
 if __name__ == "__main__":
     import unittest
+
     unittest.main()