chore: attempt to fix flaky functional test

JohnVillalovos · JohnVillalovos · commit 487b9a875a18 · 2021-09-08T09:13:56.000-07:00
Add an additional check to attempt to solve the flakiness of the
test_merge_request_should_remove_source_branch() test.
diff --git a/tests/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py
@@ -125,10 +125,18 @@ def test_merge_request_should_remove_source_branch(
         time.sleep(0.5)
     assert mr.merged_at is not None
     time.sleep(0.5)
+    result = wait_for_sidekiq(timeout=60)
+    assert result is True, "sidekiq process should have terminated but did not"
 
     # Ensure we can NOT get the MR branch
     with pytest.raises(gitlab.exceptions.GitlabGetError):
-        project.branches.get(source_branch)
+        result = project.branches.get(source_branch)
+        # Help to debug in case the expected exception doesn't happen.
+        import pprint
+
+        print("mr:", pprint.pformat(mr))
+        print("mr.merged_at:", pprint.pformat(mr.merged_at))
+        print("result:", pprint.pformat(result))
 
 
 def test_merge_request_large_commit_message(
