@@ -54,7 +54,8 @@ def test_push_observations_to_issue_tracker(self, mock_current_user, mock_issue_
5454 @patch ("application.issue_tracker.services.issue_tracker.issue_tracker_factory" )
5555 def test_push_observation_to_issue_tracker_not_active (self , mock ):
5656 observation = Observation .objects .get (pk = 1 )
57- push_observation_to_issue_tracker (observation , None )
57+ with self .captureOnCommitCallbacks (execute = True ):
58+ push_observation_to_issue_tracker (observation , None )
5859 mock .assert_not_called ()
5960
6061 @patch ("application.issue_tracker.services.issue_tracker.issue_tracker_factory" )
@@ -63,7 +64,8 @@ def test_push_observation_to_issue_tracker_not_default_branch(self, mock):
6364 observation .product .issue_tracker_active = True
6465 not_default_branch = Branch .objects .get (pk = 2 )
6566 observation .branch = not_default_branch
66- push_observation_to_issue_tracker (observation , None )
67+ with self .captureOnCommitCallbacks (execute = True ):
68+ push_observation_to_issue_tracker (observation , None )
6769 mock .assert_not_called ()
6870
6971 @patch ("application.issue_tracker.services.issue_tracker.issue_tracker_factory" )
@@ -75,7 +77,8 @@ def test_push_observation_to_issue_tracker_open_no_id_no_issue(self, observation
7577 observation .product .issue_tracker_active = True
7678 observation .current_status = Status .STATUS_OPEN
7779
78- push_observation_to_issue_tracker (observation , None )
80+ with self .captureOnCommitCallbacks (execute = True ):
81+ push_observation_to_issue_tracker (observation , None )
7982
8083 expected_calls = [call (observation .product ), call ().create_issue (observation )]
8184 mock .assert_has_calls (expected_calls , any_order = False )
@@ -92,7 +95,8 @@ def test_push_observation_to_issue_tracker_open_with_id_with_issue(self, observa
9295 observation .current_status = Status .STATUS_OPEN
9396 observation .issue_tracker_issue_id = "123"
9497
95- push_observation_to_issue_tracker (observation , None )
98+ with self .captureOnCommitCallbacks (execute = True ):
99+ push_observation_to_issue_tracker (observation , None )
96100
97101 observation_mock .assert_not_called ()
98102 expected_calls = [
@@ -111,7 +115,8 @@ def test_push_observation_to_issue_tracker_closed_no_id_no_issue(self, observati
111115 observation .product .issue_tracker_active = True
112116 observation .current_status = Status .STATUS_NOT_AFFECTED
113117
114- push_observation_to_issue_tracker (observation , None )
118+ with self .captureOnCommitCallbacks (execute = True ):
119+ push_observation_to_issue_tracker (observation , None )
115120
116121 expected_calls = [call (observation .product )]
117122 factory_mock .assert_has_calls (expected_calls , any_order = False )
@@ -128,7 +133,8 @@ def test_push_observation_to_issue_tracker_closed_with_id_with_issue(self, obser
128133 observation .current_status = Status .STATUS_FALSE_POSITIVE
129134 observation .issue_tracker_issue_id = "123"
130135
131- push_observation_to_issue_tracker (observation , None )
136+ with self .captureOnCommitCallbacks (execute = True ):
137+ push_observation_to_issue_tracker (observation , None )
132138
133139 expected_calls = [
134140 call (observation .product ),
@@ -146,7 +152,8 @@ def test_push_observation_to_issue_tracker_exception(self, exception_mock, facto
146152
147153 observation = Observation .objects .get (pk = 1 )
148154 observation .product .issue_tracker_active = True
149- push_observation_to_issue_tracker (observation , self .user_internal )
155+ with self .captureOnCommitCallbacks (execute = True ):
156+ push_observation_to_issue_tracker (observation , self .user_internal )
150157
151158 exception_mock .assert_called_with (exception , self .user_internal )
152159
@@ -166,7 +173,8 @@ def test_push_observation_to_issue_tracker_with_issue_higher_than_minimum(self,
166173 observation .numerical_severity = Severity .NUMERICAL_SEVERITIES .get (observation .current_severity , 99 )
167174 observation .issue_tracker_issue_id = "123"
168175
169- push_observation_to_issue_tracker (observation , None )
176+ with self .captureOnCommitCallbacks (execute = True ):
177+ push_observation_to_issue_tracker (observation , None )
170178
171179 self .assertEqual (observation_mock .call_count , 2 )
172180 expected_calls = [
@@ -190,7 +198,8 @@ def test_push_observation_to_issue_tracker_with_issue_higher_than_minimum(self,
190198 observation .numerical_severity = Severity .NUMERICAL_SEVERITIES .get (observation .current_severity , 99 )
191199 observation .issue_tracker_issue_id = "123"
192200
193- push_observation_to_issue_tracker (observation , None )
201+ with self .captureOnCommitCallbacks (execute = True ):
202+ push_observation_to_issue_tracker (observation , None )
194203
195204 observation_mock .assert_not_called ()
196205 expected_calls = [
@@ -214,7 +223,8 @@ def test_push_observation_to_issue_tracker_no_issue_lower_than_minimum(self, obs
214223 observation .current_severity = Severity .SEVERITY_MEDIUM
215224 observation .numerical_severity = Severity .NUMERICAL_SEVERITIES .get (observation .current_severity , 99 )
216225
217- push_observation_to_issue_tracker (observation , None )
226+ with self .captureOnCommitCallbacks (execute = True ):
227+ push_observation_to_issue_tracker (observation , None )
218228
219229 observation_mock .assert_not_called ()
220230 expected_calls = [
@@ -238,7 +248,8 @@ def test_push_observation_to_issue_tracker_with_issue_lower_than_minimum_not_clo
238248 observation .numerical_severity = Severity .NUMERICAL_SEVERITIES .get (observation .current_severity , 99 )
239249 observation .issue_tracker_issue_id = "123"
240250
241- push_observation_to_issue_tracker (observation , None )
251+ with self .captureOnCommitCallbacks (execute = True ):
252+ push_observation_to_issue_tracker (observation , None )
242253
243254 observation_mock .assert_called_once ()
244255 expected_calls = [
@@ -265,7 +276,8 @@ def test_push_observation_to_issue_tracker_with_issue_lower_than_minimum_already
265276 observation .issue_tracker_issue_id = "123"
266277 observation .issue_tracker_issue_closed = True
267278
268- push_observation_to_issue_tracker (observation , None )
279+ with self .captureOnCommitCallbacks (execute = True ):
280+ push_observation_to_issue_tracker (observation , None )
269281
270282 observation_mock .assert_not_called ()
271283 expected_calls = [
@@ -279,28 +291,32 @@ def test_push_observation_to_issue_tracker_with_issue_lower_than_minimum_already
279291 @patch ("application.issue_tracker.services.issue_tracker.issue_tracker_factory" )
280292 def test_push_deleted_observation_not_active_no_id (self , mock ):
281293 product = Product .objects .get (pk = 1 )
282- push_deleted_observation_to_issue_tracker (product , "" , None )
294+ with self .captureOnCommitCallbacks (execute = True ):
295+ push_deleted_observation_to_issue_tracker (product , "" , None )
283296 mock .assert_not_called ()
284297
285298 @patch ("application.issue_tracker.services.issue_tracker.issue_tracker_factory" )
286299 def test_push_deleted_observation_active_no_id (self , mock ):
287300 product = Product .objects .get (pk = 1 )
288301 product .issue_tracker_active = True
289- push_deleted_observation_to_issue_tracker (product , "" , None )
302+ with self .captureOnCommitCallbacks (execute = True ):
303+ push_deleted_observation_to_issue_tracker (product , "" , None )
290304 mock .assert_not_called ()
291305
292306 @patch ("application.issue_tracker.services.issue_tracker.issue_tracker_factory" )
293307 def test_push_deleted_observation_not_active_with_id (self , mock ):
294308 product = Product .objects .get (pk = 1 )
295- push_deleted_observation_to_issue_tracker (product , "123" , None )
309+ with self .captureOnCommitCallbacks (execute = True ):
310+ push_deleted_observation_to_issue_tracker (product , "123" , None )
296311 mock .assert_not_called ()
297312
298313 @patch ("application.issue_tracker.services.issue_tracker.issue_tracker_factory" )
299314 def test_push_deleted_observation_active_with_id_no_issue (self , mock ):
300315 mock .return_value .get_issue .return_value = None
301316 product = Product .objects .get (pk = 1 )
302317 product .issue_tracker_active = True
303- push_deleted_observation_to_issue_tracker (product , "123" , None )
318+ with self .captureOnCommitCallbacks (execute = True ):
319+ push_deleted_observation_to_issue_tracker (product , "123" , None )
304320 expected_calls = [call (product ), call ().get_issue (product , "123" )]
305321 mock .assert_has_calls (expected_calls , any_order = False )
306322
@@ -310,7 +326,8 @@ def test_push_deleted_observation_active_with_id_with_issue(self, mock):
310326 mock .return_value .get_issue .return_value = issue
311327 product = Product .objects .get (pk = 1 )
312328 product .issue_tracker_active = True
313- push_deleted_observation_to_issue_tracker (product , "123" , None )
329+ with self .captureOnCommitCallbacks (execute = True ):
330+ push_deleted_observation_to_issue_tracker (product , "123" , None )
314331 expected_calls = [
315332 call (product ),
316333 call ().get_issue (product , "123" ),
@@ -326,7 +343,8 @@ def test_push_deleted_observation_exception(self, exception_mock, factory_mock):
326343
327344 product = Product .objects .get (pk = 1 )
328345 product .issue_tracker_active = True
329- push_deleted_observation_to_issue_tracker (product , "123" , self .user_internal )
346+ with self .captureOnCommitCallbacks (execute = True ):
347+ push_deleted_observation_to_issue_tracker (product , "123" , self .user_internal )
330348
331349 exception_mock .assert_called_with (exception , self .user_internal )
332350
0 commit comments