Skip to content

Commit 826fe51

Browse files
mwang2016mwang2016
authored
Adding more test cases (#224)
1 parent 427921b commit 826fe51

File tree

4 files changed

+134
-9
lines changed

4 files changed

+134
-9
lines changed

‎.circleci/functional-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
cd testing/integration
44
. venv/bin/activate
5-
pytest --durations=10
5+
pytest -rfps --durations=10

‎testing/integration/conftest.py‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,15 @@ def test_env(request):
6666
cfg = parser.items('DEFAULT')
6767
conf = dict(cfg)
6868

69-
conf["splunk_url"] = request.config.getoption("--splunk-url")
70-
conf["splunk_user"] = request.config.getoption("--splunk-user")
71-
conf["splunk_password"] = request.config.getoption("--splunk-password")
72-
conf["api_endpoint"] = request.config.getoption("--api-endpoint")
73-
conf["splunk_index"] = request.config.getoption("--splunk-index")
69+
if request.config.getoption("--splunk-url"):
70+
conf["splunk_url"] = request.config.getoption("--splunk-url")
71+
if request.config.getoption("--splunk-user"):
72+
conf["splunk_user"] = request.config.getoption("--splunk-user")
73+
if request.config.getoption("--splunk-password"):
74+
conf["splunk_password"] = request.config.getoption("--splunk-password")
75+
if request.config.getoption("--api-endpoint"):
76+
conf["api_endpoint"] = request.config.getoption("--api-endpoint")
77+
if request.config.getoption("--splunk-index"):
78+
conf["splunk_index"] = request.config.getoption("--splunk-index")
7479

7580
return conf

‎testing/integration/lib/splunk_api.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def collect_events(self, query, start_time, end_time):
4242

4343
search_url = '{0}/services/search/jobs?output_mode=json'.format(self.env["splunk_url"])
4444

45-
self.logger.info('requesting: %s', search_url)
45+
# self.logger.info('requesting: %s', search_url)
4646
data = {
4747
'search': query,
4848
'earliest_time': start_time,
@@ -70,7 +70,7 @@ def wait_for_job_and_get_events(self, job_id):
7070
events = []
7171
job_url = '{0}/services/search/jobs/{1}?output_mode=json'.format(
7272
self.env["splunk_url"], str(job_id))
73-
self.logger.info('requesting: %s', job_url)
73+
# self.logger.info('requesting: %s', job_url)
7474

7575
for _ in range(TIMEROUT):
7676
res = self.requests_retry_session().get(

‎testing/integration/testcases/test_nozzle_configurations.py‎

Lines changed: 121 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ def test_search_event_on_splunk_is_not_empty(self, test_env, splunk_logger):
2020
@pytest.mark.Critical
2121
@pytest.mark.parametrize("query_input", [
2222
"index={} cf_app_name=data_gen nozzle-event-counter>0", # nozzle-event-counter should be searchable
23-
"index={} cf_app_name=data_gen subscription-id::splunk-ci" # subscription-id should be searchable
23+
"index={} cf_app_name=data_gen subscription-id::splunk-ci", # subscription-id should be searchable
24+
"index={} cf_app_name=data_gen uuid::*" # uuid should be searchable
2425
])
2526
def test_enable_event_tracing_is_true(self, test_env, splunk_logger, query_input):
2627
self.splunk_api = SplunkApi(test_env, splunk_logger)
@@ -31,4 +32,123 @@ def test_enable_event_tracing_is_true(self, test_env, splunk_logger, query_input
3132
assert len(search_results) > 0, \
3233
'\nNumber of events from Splunk should not be {}, however the result is {}'.format(0, len(search_results))
3334

35+
@pytest.mark.Critical
36+
@pytest.mark.parametrize("query_input", [
37+
"index=*.*", # wrong splunk index format should return 0 result
38+
"index=wrong_index" # wrong splunk index value should return 0 result
39+
])
40+
def test_search_by_incorrect_splunk_index(self, test_env, splunk_logger, query_input):
41+
self.splunk_api = SplunkApi(test_env, splunk_logger)
42+
43+
search_results = self.splunk_api.check_events_from_splunk(
44+
query=query_input,
45+
start_time="-15m@m")
46+
assert len(search_results) == 0, \
47+
'\nNumber of events from Splunk should be {}, however the result is {}'.format(0, len(search_results))
48+
49+
@pytest.mark.Critical
50+
@pytest.mark.parametrize("query_input", [
51+
"index={} cf_app_name=data_gen", # when add_app_info is true, cf_app_name is searchable
52+
"index={} cf_org_name=splunk-ci-org", # when add_app_info is true, cf_org_name is searchable
53+
"index={} cf_space_name=splunk-ci-space" # when add_app_info is true, cf_space_name is searchable
54+
])
55+
def test_add_app_info_is_true(self, test_env, splunk_logger, query_input):
56+
self.splunk_api = SplunkApi(test_env, splunk_logger)
57+
58+
search_results = self.splunk_api.check_events_from_splunk(
59+
query=query_input.format(test_env['splunk_index']),
60+
start_time="-15m@m")
61+
assert len(search_results) > 0, \
62+
'\nNumber of events from Splunk should not be {}, however the result is {}'.format(0, len(search_results))
63+
64+
@pytest.mark.Critical
65+
@pytest.mark.parametrize("query_input", [
66+
"index={} cf_app_name=data_gen", # when add_app_info is true, cf_app_name is searchable
67+
"index={} cf_org_name=splunk-ci-org", # when add_app_info is true, cf_org_name is searchable
68+
"index={} cf_space_name=splunk-ci-space" # when add_app_info is true, cf_space_name is searchable
69+
])
70+
def test_add_app_info_is_true(self, test_env, splunk_logger, query_input):
71+
self.splunk_api = SplunkApi(test_env, splunk_logger)
72+
73+
search_results = self.splunk_api.check_events_from_splunk(
74+
query=query_input.format(test_env['splunk_index']),
75+
start_time="-15m@m")
76+
assert len(search_results) > 0, \
77+
'\nNumber of events from Splunk should not be {}, however the result is {}'.format(0, len(search_results))
78+
79+
@pytest.mark.Critical
80+
@pytest.mark.parametrize("query_input", [
81+
"index={}| spath event_type | search event_type=LogMessage",
82+
"index={}| spath event_type | search event_type=ValueMetric",
83+
"index={}| spath event_type | search event_type=CounterEvent",
84+
"index={}| spath event_type | search event_type=HttpStartStop",
85+
"index={}| spath event_type | search event_type=ContainerMetric"
86+
])
87+
def test_search_by_event_type(self, test_env, splunk_logger, query_input):
88+
self.splunk_api = SplunkApi(test_env, splunk_logger)
89+
90+
search_results = self.splunk_api.check_events_from_splunk(
91+
query=query_input.format(test_env['splunk_index']),
92+
start_time="-15m@m")
93+
assert len(search_results) > 0, \
94+
'\nNumber of events from Splunk should not be {}, however the result is {}'.format(0, len(search_results))
95+
96+
@pytest.mark.Critical
97+
@pytest.mark.parametrize("query_input", [
98+
"index={} name::update-ci-test"
99+
])
100+
def test_search_by_extra_fields(self, test_env, splunk_logger, query_input):
101+
self.splunk_api = SplunkApi(test_env, splunk_logger)
102+
103+
search_results = self.splunk_api.check_events_from_splunk(
104+
query=query_input.format(test_env['splunk_index']),
105+
start_time="-15m@m")
106+
assert len(search_results) > 0, \
107+
'\nNumber of events from Splunk should not be {}, however the result is {}'.format(0, len(search_results))
108+
109+
@pytest.mark.Critical
110+
@pytest.mark.parametrize("query_input", [
111+
"index={} arch::old",
112+
"index={} arch::*"
113+
])
114+
def test_search_by_wrong_extra_fields(self, test_env, splunk_logger, query_input):
115+
self.splunk_api = SplunkApi(test_env, splunk_logger)
116+
117+
search_results = self.splunk_api.check_events_from_splunk(
118+
query=query_input.format(test_env['splunk_index']),
119+
start_time="-15m@m")
120+
assert len(search_results) == 0, \
121+
'\nNumber of events from Splunk should be {}, however the result is {}'.format(0, len(search_results))
122+
123+
@pytest.mark.Critical
124+
@pytest.mark.parametrize("query_input", [
125+
"index={} cf_app_name=data_gen subscription-id::* event_type=LogMessage"
126+
])
127+
def test_fields_and_values_in_splunk_event(self, test_env, splunk_logger, query_input):
128+
self.splunk_api = SplunkApi(test_env, splunk_logger)
129+
130+
search_results = self.splunk_api.check_events_from_splunk(
131+
query=query_input.format(test_env['splunk_index']),
132+
start_time="-15m@m")
133+
last_event = search_results[0]
134+
135+
expect_content = {
136+
'_sourcetype': 'cf:logmessage',
137+
'cf_app_name': 'data_gen',
138+
'index': test_env['splunk_index'],
139+
'source': 'compute',
140+
'sourcetype': 'cf:logmessage',
141+
'subscription-id': 'splunk-ci'
142+
}
143+
144+
assert_json_contains(expect_content, last_event, "Event raw data results mismatch")
145+
last_event_raw = json.loads(last_event['_raw'])
34146

147+
expect_raw_data = {
148+
"cf_app_name": "data_gen",
149+
"cf_org_name": "splunk-ci-org",
150+
"cf_origin": "firehose",
151+
"cf_space_name": "splunk-ci-space",
152+
"event_type": "LogMessage"
153+
}
154+
assert_json_contains(expect_raw_data, last_event_raw, "Event raw data results mismatch")

0 commit comments

Comments
 (0)