From 923920e5cb7699a239610faf7fe1e9e1082dd617 Mon Sep 17 00:00:00 2001
From: Julen Ruiz Aizpuru <julenx@gmail.com>
Date: Wed, 8 Jan 2020 11:28:22 +0100
Subject: [PATCH] Tests: ensure revision is set prior to test runs

Newer fakeredis versions flush their internal state after every test run
to keep them isolated. This means we need to reinitialize the revision
counter for some of our tests.
---
 tests/env.py            | 12 ------------
 tests/models/store.py   |  2 +-
 tests/views/timeline.py |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/tests/env.py b/tests/env.py
index 237ad58d08..948f17c678 100644
--- a/tests/env.py
+++ b/tests/env.py
@@ -27,18 +27,14 @@ def setup(self, request):
         """
         data_file = self.data_file
         if os.path.isfile(data_file):
-            from pootle_store.models import Unit
-
             self.setup_case_sensitive_schema()
             call_command('loaddata', data_file)
-            self.setup_redis(revision=Unit.max_revision())
         else:
             self.setup_site_db(request)
             with open(data_file, 'w') as file:
                 call_command('dumpdata', '--indent=3', stdout=file)
 
     def setup_site_db(self, request, **kwargs):
-        self.setup_redis()
         self.setup_case_sensitive_schema()
         self.setup_site_root()
         self.setup_languages()
@@ -179,14 +175,6 @@ def setup_languages(self):
         from .fixtures.models.language import _require_language
         _require_language('en', 'English')
 
-    def setup_redis(self, revision=None):
-        from pootle.core.models import Revision
-
-        if revision is None:
-            Revision.initialize(force=True)
-        else:
-            Revision.set(revision)
-
     def setup_system_users(self, request):
         from .fixtures.models.user import TEST_USERS, _require_user
 
diff --git a/tests/models/store.py b/tests/models/store.py
index d07fcd6b90..3f2cc48296 100644
--- a/tests/models/store.py
+++ b/tests/models/store.py
@@ -29,7 +29,7 @@
 
 
 @pytest.mark.django_db
-def test_delete_mark_obsolete(project0_disk, store0):
+def test_delete_mark_obsolete(project0_disk, store0, revision):
     """Tests that the in-DB Store and Directory are marked as obsolete
     after the on-disk file ceased to exist.
 
diff --git a/tests/views/timeline.py b/tests/views/timeline.py
index 8427f7eeff..e562f439a7 100644
--- a/tests/views/timeline.py
+++ b/tests/views/timeline.py
@@ -274,7 +274,7 @@ def test_timeline_view_unit_disabled_project(client, request_users,
 
 @pytest.mark.django_db
 def test_timeline_view_unit_with_suggestion(client, request_users,
-                                            system, admin, store0):
+                                            system, admin, store0, revision):
     # test with "state change" subission - apparently this is what is required
     # to get one
     suggestion = Suggestion.objects.filter(