Resolved comments from review.

Author: Frederick Ross

splunklib/client.py

@@ -401,7 +401,7 @@ def messages(self):
     @property
     def modular_input_kinds(self):
         """Returns a collection of the modular input kinds on this Splunk instance."""
-        if self.splunk_version[0] >= 5:
+        if self.splunk_version >= (5,):
             return ReadOnlyCollection(self, PATH_MODULAR_INPUTS, item=ModularInputKind)
         else:
             raise IllegalOperationException("Modular inputs are not supported before Splunk version 5.")
@@ -1481,7 +1481,7 @@ def default(self):
         return index['defaultDatabase']
 
     def delete(self, name):
-        if self.service.splunk_version[0] >= 5:
+        if self.service.splunk_version >= (5,):
             Collection.delete(self, name)
         else:
             raise IllegalOperationException("Deleting indexes via the REST API is "
@@ -1558,12 +1558,19 @@ def clean(self, timeout=60):
         self.refresh()
         tds = self['maxTotalDataSizeMB']
         ftp = self['frozenTimePeriodInSecs']
+        was_disabled_initially = self.disabled
         try:
+            if (not was_disabled_initially and \
+                self.service.splunk_version < (5,)):
+                # Need to disable the index first on Splunk 4.x,
+                # but it doesn't work to disable it on 5.0.
+                self.disable()
             self.update(maxTotalDataSizeMB=1, frozenTimePeriodInSecs=1)
             self.roll_hot_buckets()
 
             start = datetime.now()
             diff = timedelta(seconds=timeout)
+            # Wait until event count goes to 0.
             while self.content.totalEventCount != '0' and datetime.now() < start+diff:
                 sleep(1)
                 self.refresh()
@@ -1573,6 +1580,10 @@ def clean(self, timeout=60):
             if self.content.totalEventCount != '0':
                 raise OperationError, "Cleaning index %s took longer than %s seconds; timing out." % \
                                       (self.name, timeout)
+            if (not was_disabled_initially and \
+                self.service.splunk_version < (5,)):
+                # Re-enable the index if it was originally enabled and we messed with it.
+                self.enable()
         return self
 
     def disable(self):

tests/test_app.py

@@ -20,7 +20,7 @@
 import splunklib.client as client
 import splunklib.data as data
 
-class TestApp(testlib.TestCase):
+class TestApp(testlib.SDKTestCase):
     app = None
     app_name = None
     def setUp(self):

tests/test_binding.py

@@ -400,7 +400,7 @@ def isatom(body):
         root.find(XNAME_ID) is not None and \
         root.find(XNAME_TITLE) is not None
 
-class TestPluggableHTTP(testlib.TestCase):
+class TestPluggableHTTP(testlib.SDKTestCase):
     # Verify pluggable HTTP reqeust handlers.
     def test_handlers(self):
         paths = ["/services", "authentication/users", 

tests/test_collection.py

@@ -37,9 +37,9 @@
 expected_fields_keys = set(['required', 'optional', 'wildcard'])
 
 
-class TestCase(testlib.TestCase):
+class CollectionTestCase(testlib.SDKTestCase):
     def setUp(self):
-        super(TestCase, self).setUp()
+        super(CollectionTestCase, self).setUp()
         if self.service.splunk_version[0] >= 5 and 'modular_input_kinds' not in collections:
             collections.append('modular_input_kinds') # Not supported before Splunk 5.0
         else:

tests/test_conf.py

@@ -19,7 +19,7 @@
 
 import splunklib.client as client
 
-class TestRead(testlib.TestCase):
+class TestRead(testlib.SDKTestCase):
     def test_read(self):
         service = client.connect(**self.opts.kwargs)
 
@@ -36,7 +36,7 @@ def test_read(self):
         for stanza in confs['indexes'].list(count=5):
             self.check_entity(stanza)
 
-class TestConfs(testlib.TestCase):
+class TestConfs(testlib.SDKTestCase):
     def setUp(self):
         super(TestConfs, self).setUp()
         self.app_name = testlib.tmpname()

tests/test_data.py

@@ -21,7 +21,7 @@
 
 import splunklib.data as data
 
-class TestCase(testlib.TestCase):
+class DataTestCase(testlib.SDKTestCase):
     def test_elems(self):
         result = data.load("")
         self.assertTrue(result is None)

tests/test_event_type.py

@@ -19,12 +19,12 @@
 
 import splunklib.client as client
 
-class TestRead(testlib.TestCase):
+class TestRead(testlib.SDKTestCase):
     def test_read(self):
         for event_type in self.service.event_types.list(count=1):
             self.check_entity(event_type)
 
-class TestCreate(testlib.TestCase):
+class TestCreate(testlib.SDKTestCase):
     def test_create(self):
         self.event_type_name = testlib.tmpname()
         event_types = self.service.event_types
@@ -47,7 +47,7 @@ def tearDown(self):
         except KeyError:
             pass
 
-class TestEventType(testlib.TestCase):
+class TestEventType(testlib.SDKTestCase):
     def setUp(self):
         super(TestEventType, self).setUp()
         self.event_type_name = testlib.tmpname()