Merge pull request ckan#9154 from ckan/failing-in-github-actions-only

Investigate failing tests in github actions only

Author: amercader

ckanext/activity/tests/test_views.py

@@ -2,7 +2,6 @@
 
 import unittest.mock as mock
 from datetime import datetime
-from time import sleep
 
 import pytest
 from bs4 import BeautifulSoup
@@ -770,19 +769,16 @@ def test_read_resource_as_it_used_to_be(self, app):
         # View as a sysadmin so we can see old versions of the dataset
         sysadmin = factories.SysadminWithToken()
         headers = {"Authorization": sysadmin["token"]}
-        def got_orig():
-            response = app.get(
-                url_for(
-                    "activity.resource_history",
-                    id=dataset["name"],
-                    resource_id=resource["id"],
-                    activity_id=activity.id,
-                ),
-                headers=headers,
-            )
-            return helpers.body_contains(response, "Original name")
-        # slow response retry
-        assert got_orig() or sleep(.5) or got_orig()
+        response = app.get(
+            url_for(
+                "activity.resource_history",
+                id=dataset["name"],
+                resource_id=resource["id"],
+                activity_id=activity.id,
+            ),
+            headers=headers,
+        )
+        assert "Original name" in response.body
 
     def test_read_deleted_resource_as_it_used_to_be(self, app):
         dataset = factories.Dataset(title="Dataset title")
@@ -804,19 +800,16 @@ def test_read_deleted_resource_as_it_used_to_be(self, app):
         # View as a sysadmin so we can see old versions of the dataset
         sysadmin = factories.SysadminWithToken()
         headers = {"Authorization": sysadmin["token"]}
-        def got_orig():
-            response = app.get(
-                url_for(
-                    "activity.resource_history",
-                    id=dataset["name"],
-                    resource_id=resource["id"],
-                    activity_id=activity.id,
-                ),
-                headers=headers,
-            )
-            return helpers.body_contains(response, resource["name"])
-        # slow response retry
-        assert got_orig() or sleep(.5) or got_orig()
+        response = app.get(
+            url_for(
+                "activity.resource_history",
+                id=dataset["name"],
+                resource_id=resource["id"],
+                activity_id=activity.id,
+            ),
+            headers=headers,
+        )
+        assert resource["name"] in response.body
 
     def test_changes(self, app):
         user = factories.UserWithToken()