Skip to content

Commit 465a4cf

Browse files
committed
Factored test code somewhat
1 parent 2d7d132 commit 465a4cf

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

validation/graylog.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@ def create_gelf_input(self):
5151
def create_correlation_count(self, *args, **kwargs):
5252
self._api.create_correlation_count(*args, **kwargs)
5353

54-
def get_events_count(self):
55-
return self._api.get_events_count()
56-
5754
def get_events(self):
5855
return self._api.get_events()
5956

57+
def get_events_count(self):
58+
events = self.get_events()
59+
return events['total_events']
60+
6061
def _has_event(self):
6162
events_count = self.get_events_count()
6263
return events_count == 1

validation/graylog_rest_api.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,4 @@ def events_search_is_available(self):
119119

120120
def get_events(self):
121121
response = self._search_events()
122-
body = response.json()
123-
return body
124-
125-
def get_events_count(self):
126-
body = self.get_events()
127-
return body['total_events']
122+
return response.json()

0 commit comments

Comments
 (0)