fixup! rename es2/mongo2 fixtures with es_forwarding/mongo_forwarding

Author: SergioSim

.env.dist

@@ -39,15 +39,15 @@ RALPH_APP_DIR=/app/.ralph
 # RALPH_BACKENDS__DATABASE__ES__INDEX=statements
 # RALPH_BACKENDS__DATABASE__ES__TEST_HOSTS=http://elasticsearch:9200
 # RALPH_BACKENDS__DATABASE__ES__TEST_INDEX=test-index
-# RALPH_BACKENDS__DATABASE__ES__TEST_INDEX_2=test-index-2
+# RALPH_BACKENDS__DATABASE__ES__TEST_FORWARDING_INDEX=test-index-2
 
 # MONGO database backend
 
 # RALPH_BACKENDS__DATABASE__MONGO__COLLECTION=foo
 # RALPH_BACKENDS__DATABASE__MONGO__DATABASE=statements
 # RALPH_BACKENDS__DATABASE__MONGO__CONNECTION_URI=mongodb://localhost:27017/
 # RALPH_BACKENDS__DATABASE__MONGO__TEST_COLLECTION=foo
-# RALPH_BACKENDS__DATABASE__MONGO__TEST_COLLECTION_2=foo-2
+# RALPH_BACKENDS__DATABASE__MONGO__TEST_FORWARDING_COLLECTION=foo-2
 # RALPH_BACKENDS__DATABASE__MONGO__TEST_DATABASE=statements
 # RALPH_BACKENDS__DATABASE__MONGO__TEST_CONNECTION_URI=mongodb://mongodb:27017/
 

tests/api/test_statements_post.py

@@ -14,11 +14,11 @@
 from ralph.exceptions import BackendException
 
 from tests.fixtures.backends import (
+    ES_TEST_FORWARDING_INDEX,
     ES_TEST_HOSTS,
-    ES_TEST_INDEX_2,
-    MONGO_TEST_COLLECTION_2,
     MONGO_TEST_CONNECTION_URI,
     MONGO_TEST_DATABASE,
+    MONGO_TEST_FORWARDING_COLLECTION,
     RUNSERVER_TEST_HOST,
     RUNSERVER_TEST_PORT,
     get_es_test_backend,
@@ -393,28 +393,28 @@ def spy_mock_forward_xapi_statements(_):
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
-    "forwarding_backend", [get_es_test_backend, get_mongo_test_backend]
+    "receiving_backend", [get_es_test_backend, get_mongo_test_backend]
 )
 @pytest.mark.parametrize(
-    "receiving_backend",
+    "forwarding_backend",
     [
-        lambda: ESDatabase(hosts=ES_TEST_HOSTS, index=ES_TEST_INDEX_2),
+        lambda: ESDatabase(hosts=ES_TEST_HOSTS, index=ES_TEST_FORWARDING_INDEX),
         lambda: MongoDatabase(
             connection_uri=MONGO_TEST_CONNECTION_URI,
             database=MONGO_TEST_DATABASE,
-            collection=MONGO_TEST_COLLECTION_2,
+            collection=MONGO_TEST_FORWARDING_COLLECTION,
         ),
     ],
 )
 async def test_post_statements_list_with_statement_forwarding(
-    forwarding_backend,
     receiving_backend,
+    forwarding_backend,
     monkeypatch,
     auth_credentials,
     es,
-    es2,
+    es_forwarding,
     mongo,
-    mongo2,
+    mongo_forwarding,
     lrs,
 ):
     """Tests the xAPI forwarding functionality given two ralph instances - a forwarding
@@ -486,7 +486,7 @@ async def test_post_statements_list_with_statement_forwarding(
             assert response.status_code == 200
 
             es.indices.refresh()
-            es2.indices.refresh()
+            es_forwarding.indices.refresh()
 
             # The statement should be stored on the forwarding client
             response = await forwarding_client.get(

tests/backends/database/test_es.py

@@ -19,7 +19,11 @@
 from ralph.conf import settings
 from ralph.exceptions import BackendException, BackendParameterException
 
-from tests.fixtures.backends import ES_TEST_HOSTS, ES_TEST_INDEX, ES_TEST_INDEX_2
+from tests.fixtures.backends import (
+    ES_TEST_FORWARDING_INDEX,
+    ES_TEST_HOSTS,
+    ES_TEST_INDEX,
+)
 
 
 def test_backends_database_es_database_instantiation(es):
@@ -465,7 +469,9 @@ def mock_search(**_):
     assert caplog.record_tuples == [(logger_name, logging.ERROR, msg)]
 
 
-def test_backends_database_es_query_statements_by_ids_with_multiple_indexes(es, es2):
+def test_backends_database_es_query_statements_by_ids_with_multiple_indexes(
+    es, es_forwarding
+):
     """Tests the ES query_statements_by_ids method, given a valid search
     query, should execute the query uniquely on the specified index and return the
     expected results.
@@ -474,17 +480,21 @@ def test_backends_database_es_query_statements_by_ids_with_multiple_indexes(es,
 
     # Insert documents
     index_1_document = {"_index": ES_TEST_INDEX, "_id": "1", "_source": {"id": "1"}}
-    index_2_document = {"_index": ES_TEST_INDEX_2, "_id": "2", "_source": {"id": "2"}}
+    index_2_document = {
+        "_index": ES_TEST_FORWARDING_INDEX,
+        "_id": "2",
+        "_source": {"id": "2"},
+    }
     bulk(es, [index_1_document])
-    bulk(es2, [index_2_document])
+    bulk(es_forwarding, [index_2_document])
 
     # As we bulk insert documents, the index needs to be refreshed before making queries
     es.indices.refresh(index=ES_TEST_INDEX)
-    es2.indices.refresh(index=ES_TEST_INDEX_2)
+    es_forwarding.indices.refresh(index=ES_TEST_FORWARDING_INDEX)
 
     # Instantiate ES Databases
     database = ESDatabase(hosts=ES_TEST_HOSTS, index=ES_TEST_INDEX)
-    database_2 = ESDatabase(hosts=ES_TEST_HOSTS, index=ES_TEST_INDEX_2)
+    database_2 = ESDatabase(hosts=ES_TEST_HOSTS, index=ES_TEST_FORWARDING_INDEX)
 
     # Check the expected search query results
     index_1_document = index_1_document | {"_score": 1.0}

tests/backends/database/test_mongo.py

@@ -18,9 +18,9 @@
 
 from tests.fixtures.backends import (
     MONGO_TEST_COLLECTION,
-    MONGO_TEST_COLLECTION_2,
     MONGO_TEST_CONNECTION_URI,
     MONGO_TEST_DATABASE,
+    MONGO_TEST_FORWARDING_COLLECTION,
 )
 
 
@@ -459,7 +459,7 @@ def mock_find(**_):
 
 
 def test_backends_database_mongo_query_statements_by_ids_with_multiple_collections(
-    mongo, mongo2
+    mongo, mongo_forwarding
 ):
     """Tests the mongo backend query_statements_by_ids method, given a valid search
     query, should execute the query uniquely on the specified collection and return the
@@ -476,7 +476,7 @@ def test_backends_database_mongo_query_statements_by_ids_with_multiple_collectio
     backend_2 = MongoDatabase(
         connection_uri=MONGO_TEST_CONNECTION_URI,
         database=MONGO_TEST_DATABASE,
-        collection=MONGO_TEST_COLLECTION_2,
+        collection=MONGO_TEST_FORWARDING_COLLECTION,
     )
 
     # Insert documents

tests/conftest.py

@@ -8,12 +8,12 @@
 from .fixtures.auth import auth_credentials  # noqa: F401
 from .fixtures.backends import (  # noqa: F401
     es,
-    es2,
     es_data_stream,
+    es_forwarding,
     events,
     lrs,
     mongo,
-    mongo2,
+    mongo_forwarding,
     swift,
     ws,
 )

tests/fixtures/backends.py

@@ -26,8 +26,8 @@
 ES_TEST_INDEX = os.environ.get(
     "RALPH_BACKENDS__DATABASE__ES__TEST_INDEX", "test-index-foo"
 )
-ES_TEST_INDEX_2 = os.environ.get(
-    "RALPH_BACKENDS__DATABASE__ES__TEST_INDEX_2", "test-index-foo-2"
+ES_TEST_FORWARDING_INDEX = os.environ.get(
+    "RALPH_BACKENDS__DATABASE__ES__TEST_FORWARDING_INDEX", "test-index-foo-2"
 )
 ES_TEST_INDEX_TEMPLATE = os.environ.get(
     "RALPH_BACKENDS__DATABASE__ES__INDEX_TEMPLATE", "test-index"
@@ -42,8 +42,8 @@
 MONGO_TEST_COLLECTION = os.environ.get(
     "RALPH_BACKENDS__DATABASE__MONGO__TEST_COLLECTION", "marsha"
 )
-MONGO_TEST_COLLECTION_2 = os.environ.get(
-    "RALPH_BACKENDS__DATABASE__MONGO__TEST_COLLECTION_2", "marsha-2"
+MONGO_TEST_FORWARDING_COLLECTION = os.environ.get(
+    "RALPH_BACKENDS__DATABASE__MONGO__TEST_FORWARDING_COLLECTION", "marsha-2"
 )
 MONGO_TEST_DATABASE = os.environ.get(
     "RALPH_BACKENDS__DATABASE__MONGO__TEST_DATABASE", "statements"
@@ -123,10 +123,10 @@ def es():
 
 
 @pytest.fixture
-def es2():
+def es_forwarding():
     """Yields a second ElasticSearch test client. See get_es_fixture above."""
 
-    for es_client in get_es_fixture(index=ES_TEST_INDEX_2):
+    for es_client in get_es_fixture(index=ES_TEST_FORWARDING_INDEX):
         yield es_client
 
 
@@ -161,10 +161,10 @@ def mongo():
 
 
 @pytest.fixture
-def mongo2():
+def mongo_forwarding():
     """Yields a second Mongo test client. See get_mongo_fixture above."""
 
-    for mongo_client in get_mongo_fixture(collection=MONGO_TEST_COLLECTION_2):
+    for mongo_client in get_mongo_fixture(collection=MONGO_TEST_FORWARDING_COLLECTION):
         yield mongo_client