@@ -56,7 +56,7 @@ def _assert_search_log_results(results, response_json, sorts, bulk=False):
56
56
@patch .object (LOGGER , "debug" )
57
57
def test_search_log_pagination (mock_logger , mock_api_caller , search_logs_json ):
58
58
client = SearchLogClient (mock_api_caller )
59
- mock_api_caller ._call_api .side_effect = [search_logs_json , search_logs_json , {}]
59
+ mock_api_caller ._call_api .side_effect = [search_logs_json , {}]
60
60
61
61
# Test default pagination
62
62
search_log_request = SearchLogRequest .views_by_guid (
@@ -72,12 +72,12 @@ def test_search_log_pagination(mock_logger, mock_api_caller, search_logs_json):
72
72
]
73
73
74
74
_assert_search_log_results (response , search_logs_json , expected_sorts )
75
- assert mock_api_caller ._call_api .call_count == 3
75
+ assert mock_api_caller ._call_api .call_count == 2
76
76
assert mock_logger .call_count == 0
77
- mock_api_caller .reset_mock ()
77
+ mock_api_caller ._call_api . reset_mock ()
78
78
79
79
# Test bulk pagination
80
- mock_api_caller ._call_api .side_effect = [search_logs_json , search_logs_json , {}]
80
+ mock_api_caller ._call_api .side_effect = [search_logs_json , {}]
81
81
response = client .search (criteria = search_log_request , bulk = True )
82
82
expected_sorts = [
83
83
SortItem (field = "createdAt" , order = SortOrder .ASCENDING ),
@@ -99,7 +99,7 @@ def test_search_log_pagination(mock_logger, mock_api_caller, search_logs_json):
99
99
in mock_logger .call_args_list [0 ][0 ][0 ]
100
100
)
101
101
mock_logger .reset_mock ()
102
- mock_api_caller .reset_mock ()
102
+ mock_api_caller ._call_api . reset_mock ()
103
103
104
104
# Test automatic bulk search conversion when exceeding threshold
105
105
with patch .object (SearchLogResults , "_MASS_EXTRACT_THRESHOLD" , - 1 ):
@@ -108,7 +108,6 @@ def test_search_log_pagination(mock_logger, mock_api_caller, search_logs_json):
108
108
# results with updated timestamp sorting
109
109
search_logs_json ,
110
110
search_logs_json ,
111
- search_logs_json ,
112
111
{},
113
112
]
114
113
search_log_request = SearchLogRequest .views_by_guid ( #
@@ -126,7 +125,11 @@ def test_search_log_pagination(mock_logger, mock_api_caller, search_logs_json):
126
125
"Result size (%s) exceeds threshold (%s)"
127
126
in mock_logger .call_args_list [0 ][0 ][0 ]
128
127
)
128
+ mock_logger .reset_mock ()
129
+ mock_api_caller ._call_api .reset_mock ()
129
130
131
+ with patch .object (SearchLogResults , "_MASS_EXTRACT_THRESHOLD" , - 1 ):
132
+ mock_api_caller ._call_api .side_effect = [search_logs_json ]
130
133
# Test exception for bulk=False with user-defined sorting and results exceeding the threshold
131
134
search_log_request = SearchLogRequest .views_by_guid (
132
135
guid = "some-guid" ,
@@ -144,24 +147,28 @@ def test_search_log_pagination(mock_logger, mock_api_caller, search_logs_json):
144
147
),
145
148
):
146
149
client .search (criteria = search_log_request , bulk = False )
150
+ assert mock_api_caller ._call_api .call_count == 1
147
151
148
- # Test exception for bulk=True with user-defined sorting
149
- search_log_request = SearchLogRequest .views_by_guid (
150
- guid = "some-guid" ,
151
- size = 1 ,
152
- sort = [SortItem (field = "some-sort2" , order = SortOrder .ASCENDING )],
153
- exclude_users = ["atlansupport" ],
154
- )
155
- with pytest .raises (
156
- InvalidRequestError ,
157
- match = (
158
- "ATLAN-PYTHON-400-067 Unable to execute "
159
- "search log bulk search with user-defined sorting options. "
160
- "Suggestion: Please ensure that no sorting options are "
161
- "included in your search log search request when performing a bulk search."
162
- ),
163
- ):
164
- client .search (criteria = search_log_request , bulk = True )
152
+ mock_logger .reset_mock ()
153
+ mock_api_caller ._call_api .reset_mock ()
154
+ # Test exception for bulk=True with user-defined sorting
155
+ search_log_request = SearchLogRequest .views_by_guid (
156
+ guid = "some-guid" ,
157
+ size = 1 ,
158
+ sort = [SortItem (field = "some-sort2" , order = SortOrder .ASCENDING )],
159
+ exclude_users = ["atlansupport" ],
160
+ )
161
+ with pytest .raises (
162
+ InvalidRequestError ,
163
+ match = (
164
+ "ATLAN-PYTHON-400-067 Unable to execute "
165
+ "search log bulk search with user-defined sorting options. "
166
+ "Suggestion: Please ensure that no sorting options are "
167
+ "included in your search log search request when performing a bulk search."
168
+ ),
169
+ ):
170
+ client .search (criteria = search_log_request , bulk = True )
171
+ assert mock_api_caller ._call_api .call_count == 0
165
172
166
173
mock_logger .reset_mock ()
167
- mock_api_caller .reset_mock ()
174
+ mock_api_caller ._call_api . reset_mock ()
0 commit comments