Skip to content

Commit 4aafc17

Browse files
author
Frederick Ross
committed
Added another required restart, and a test to see that indexes actually get deleted on Splunk >= 5.0.
1 parent 9cfcb03 commit 4aafc17

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

tests/test_examples.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ def test_index(self):
143143
"index.py disable sdk-tests",
144144
"index.py enable sdk-tests",
145145
"index.py clean sdk-tests")
146+
self.restartSplunk()
146147

147148
def test_info(self):
148149
self.check_commands(

tests/test_index.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ def tearDown(self):
3636
# someone cares to go clean them up. Unique naming prevents
3737
# clashes, though.
3838
if self.service.splunk_version >= (5,):
39-
self.service.indexes.delete(self.index_name)
39+
if self.index_name in self.service.indexes:
40+
self.service.indexes.delete(self.index_name)
4041
self.assertEventuallyTrue(lambda: self.index_name not in self.service.indexes)
4142
else:
4243
logging.warning("test_index.py:TestDeleteIndex: Skipped: cannot "
@@ -46,6 +47,12 @@ def totalEventCount(self):
4647
self.index.refresh()
4748
return int(self.index['totalEventCount'])
4849

50+
def test_delete(self):
51+
if self.service.splunk_version >= (5,):
52+
self.assertTrue(self.index_name in self.service.indexes)
53+
self.service.indexes.delete(self.index_name)
54+
self.assertEventuallyTrue(lambda: self.index_name not in self.service.indexes)
55+
4956
def test_integrity(self):
5057
self.check_entity(self.index)
5158

0 commit comments

Comments
 (0)