Skip to content

Commit c656266

Browse files
Merge pull request #416 from splunk/INFRA-34069-Fix-Nested-SavedSearch-tests
INFRA-34069 Fix Nested SavedSearch tests
2 parents b0e78c1 + b2f5a5b commit c656266

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108

109109
release:
110110
docker:
111-
- image: circleci/node:12
111+
- image: circleci/node:14
112112
steps:
113113
- checkout
114114
- run: npx semantic-release

pytest_splunk_addon/standard_lib/fields_tests/test_templates.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,12 +336,14 @@ def test_savedsearches(
336336
latest_time = splunk_searchtime_fields_savedsearches["dispatch.latest_time"]
337337

338338
temp_search_query = search_query.split("|")
339-
temp_search_query[0] += " earliest_time = {0} latest_time = {1} ".format(
340-
earliest_time, latest_time
341-
)
342-
search_query = "|".join(temp_search_query)
343-
344-
search = f"search {search_query}"
339+
if temp_search_query[0].find("savedsearch") == -1 and (len(temp_search_query) < 2 or temp_search_query[1].find("savedsearch") == -1) :
340+
temp_search_query[0] += " earliest_time = {0} latest_time = {1} ".format(
341+
earliest_time, latest_time
342+
)
343+
search_query = "|".join(temp_search_query)
344+
search = f"search {search_query}"
345+
else:
346+
search = "|".join(temp_search_query)
345347

346348
self.logger.info(f"Search: {search}")
347349

0 commit comments

Comments
 (0)