PLM-160: Improve CI e2e tests (#108)

Author: inelpandzic

.github/workflows/e2etests.yml

@@ -41,28 +41,14 @@ jobs:
         run: |
           make test-build
 
-      - name: Run PLM
-        run: |
-          echo "Starting project..."
-          bin/plm_test \
-            --source="mongodb://source:pass@rs00:30000" \
-            --target="mongodb://target:pass@rs10:30100" \
-            --reset-state --start --log-level debug &> server.log &
-          echo $! > server.pid
-          sleep 5
-          echo "Project started with PID $(cat server.pid)"
-          cat server.log
-
       - name: Run tests (pytest)
         run: |
           export TEST_SOURCE_URI=mongodb://adm:pass@rs00:30000
           export TEST_TARGET_URI=mongodb://adm:pass@rs10:30100
           export TEST_PLM_URL=http://127.0.0.1:2242
-          poetry run pytest
+          export TEST_PLM_BIN=./bin/plm_test
 
-      - name: Show server logs (on failure)
-        if: failure()
-        run: tail -n 500 server.log
+          poetry run pytest
 
       - name: Teardown Docker Compose
         if: always()

tests/conftest.py

@@ -34,20 +34,25 @@ def pytest_collection_modifyitems(config, items):
             if "slow" in item.keywords:
                 item.add_marker(skip_slow)
 
+def source_uri(request: pytest.FixtureRequest):
+    """Provide the source MongoDB URI."""
+    return request.config.getoption("--source-uri") or os.environ["TEST_SOURCE_URI"]
+
+def target_uri(request: pytest.FixtureRequest):
+    """Provide the target MongoDB URI."""
+    return request.config.getoption("--target-uri") or os.environ["TEST_TARGET_URI"]
 
 @pytest.fixture(scope="session")
 def source_conn(request: pytest.FixtureRequest):
     """Provide a MongoClient connection to the source MongoDB."""
-    uri = request.config.getoption("--source-uri") or os.environ["TEST_SOURCE_URI"]
-    with MongoClient(uri) as conn:
+    with MongoClient(source_uri(request)) as conn:
         yield conn
 
 
 @pytest.fixture(scope="session")
 def target_conn(request: pytest.FixtureRequest):
     """Provide a MongoClient connection to the target MongoDB."""
-    uri = request.config.getoption("--target-uri") or os.environ["TEST_TARGET_URI"]
-    with MongoClient(uri) as conn:
+    with MongoClient(target_uri(request)) as conn:
         yield conn
 
 
@@ -76,11 +81,13 @@ def drop_all_database(source_conn: MongoClient, target_conn: MongoClient):
     testing.drop_all_database(target_conn)
 
 
-PML_PROC: subprocess.Popen = None
+PLM_PROC: subprocess.Popen = None
 
 
-def start_plm(plm_bin: str):
-    rv = subprocess.Popen([plm_bin, "--reset-state", "--log-level=trace"])
+def start_plm(plm_bin: str, request: pytest.FixtureRequest):
+    source = source_uri(request)
+    target = target_uri(request)
+    rv = subprocess.Popen([plm_bin,"--source", source ,"--target", target, "--reset-state", "--log-level=trace"])
     time.sleep(1)
     return rv
 
@@ -97,15 +104,15 @@ def manage_plm_process(request: pytest.FixtureRequest, plm_bin: str):
         yield
         return
 
-    global PML_PROC  # pylint: disable=W0603
-    PML_PROC = start_plm(plm_bin)
+    global PLM_PROC  # pylint: disable=W0603
+    PLM_PROC = start_plm(plm_bin, request)
 
     def teardown():
-        if PML_PROC and PML_PROC.poll() is None:
-            stop_plm(PML_PROC)
+        if PLM_PROC and PLM_PROC.poll() is None:
+            stop_plm(PLM_PROC)
 
     request.addfinalizer(teardown)
-    yield PML_PROC
+    yield PLM_PROC
 
 
 @pytest.hookimpl(hookwrapper=True)
@@ -122,7 +129,7 @@ def restart_plm_on_failure(request: pytest.FixtureRequest, plm_bin: str):
 
     if hasattr(request.node, "rep_call") and request.node.rep_call.failed:
         # the test failed. restart plm process with a new state
-        global PML_PROC  # pylint: disable=W0603
-        if PML_PROC and plm_bin:
-            stop_plm(PML_PROC)
-            PML_PROC = start_plm(plm_bin)
+        global PLM_PROC  # pylint: disable=W0603
+        if PLM_PROC and plm_bin:
+            stop_plm(PLM_PROC)
+            PLM_PROC = start_plm(plm_bin, request)

tests/test_collections.py

@@ -2,6 +2,7 @@
 import random
 from datetime import datetime
 
+import time
 import pytest
 import testing
 from plm import PLM, Runner
@@ -125,7 +126,7 @@ def test_create_view_with_collation(t: Testing, phase: Runner.Phase):
     t.compare_all()
 
 
-@pytest.mark.timeout(15)
+@pytest.mark.timeout(20)
 @pytest.mark.parametrize("phase", [Runner.Phase.APPLY, Runner.Phase.CLONE])
 def test_create_timeseries_ignored(t: Testing, phase: Runner.Phase):
     with t.run(phase):
@@ -327,7 +328,7 @@ def test_modify_view(t: Testing, phase: Runner.Phase):
     t.compare_all()
 
 
-@pytest.mark.timeout(15)
+@pytest.mark.timeout(20)
 @pytest.mark.parametrize("phase", [Runner.Phase.APPLY, Runner.Phase.CLONE])
 def test_modify_timeseries_options_ignored(t: Testing, phase: Runner.Phase):
     t.source["db_1"].create_collection(
@@ -598,6 +599,8 @@ def test_plm_110_rename_during_clone_and_repl(t: Testing):
         r.start()
         r.wait_for_state(PLM.State.RUNNING)
 
+        time.sleep(1)  # ensure actual clone has started
+
         for ns in testing.list_all_namespaces(t.source):
             t.source.admin.command({"renameCollection": ns, "to": ns + "_renamed"})
         for ns in testing.list_all_namespaces(t.source):