chore: spiking testcontainers

Author: elliottmurray

Makefile

@@ -36,7 +36,6 @@ define E2E
   pip install -r requirements.txt
   pip install -e ../../
   ./run_pytest.sh 
-  ./verify_pact.sh
 endef
 export E2E
 

examples/e2e/requirements.txt

@@ -1,3 +1,4 @@
 Flask==1.1.1
 pytest==5.4.1
-requests==2.23.0
+requests==2.23.0
+testcontainers==3.3.0

examples/e2e/run_pytest.sh

@@ -1,22 +1,19 @@
 #!/bin/bash
 set -o pipefail
 
+FLASK_APP=pact_provider.py python -m flask run -p 5001 & &>/dev/null
 
-
-FLASK_APP=pact_provider.py python -m flask run -p 1235 & &>/dev/null
-
-# python pact_provider.py & &>/dev/null
 FLASK_PID=$!
 
-function teardown {
-  echo "Tearing down Flask server ${FLASK_PID}"
-
-  kill -9 $FLASK_PID
-}
+teardown() {
+  echo "Tearing down Flask server ${FLASK_PID}";
+  kill -9 $FLASK_PID;
+};
 trap teardown EXIT
 
 sleep 3
 
-pytest
+pytest --publish-pact 1
+
+teardown
 
-teardown()

examples/e2e/tests/broker_container.py

@@ -1,4 +1,8 @@
 
+from testcontainers.compose import DockerCompose
+
+import pytest
+
 def pytest_addoption(parser):
     parser.addoption(
         "--publish-pact", type=str, action="store",
@@ -9,3 +13,25 @@ def pytest_addoption(parser):
         "--provider-url", type=str, action="store",
         help="The url to our provider."
     )
+
+
+@pytest.fixture(scope='session', autouse=True)
+def broker(request):
+    version = request.config.getoption('--publish-pact')
+    publish = True if version else False
+
+    # yield
+    if not publish:
+        yield
+        return
+
+    print('Starting broker')
+    with DockerCompose("../broker",
+                       compose_file_name=["docker-compose.yml"],
+                       pull=True) as compose:
+
+        stdout, stderr = compose.get_logs()
+        if stderr:
+            print("Errors\\n:{}".format(stderr))
+        print(stdout)
+        yield

examples/e2e/tests/conftest.py

@@ -2,9 +2,6 @@
 
 import logging
 import os
-import atexit
-
-from testcontainers.compose import DockerCompose
 
 import pytest
 from pact import Consumer, Like, Provider, Term, Format
@@ -32,27 +29,8 @@ def consumer():
         .format(host=PACT_MOCK_HOST, port=PACT_MOCK_PORT)
     )
 
-@pytest.fixture(scope='session')
-def broker(request):
-    version = request.config.getoption('--publish-pact')
-    publish = True if version else False
-
-    if not publish:
-        return
-
-    print('Starting broker')
-    with DockerCompose("../broker",
-                       compose_file_name=["docker-compose.yml"],
-                       pull=True) as compose:
-
-        stdout, stderr = compose.get_logs()
-        if stderr:
-            print("Errors\\n:{}".format(stderr))
-        print(stdout)
-        yield
-
 
-@pytest.fixture(scope='session')
+@pytest.fixture(scope='class')
 def pact(request):
     version = request.config.getoption('--publish-pact')
     publish = True if version else False
@@ -103,4 +81,4 @@ def test_get_non_existing_user(broker, pact, consumer):
     with pact:
         user = consumer.get_user('UserA')
         assert user is None
-    # pact.verify()
+        pact.verify()

examples/e2e/tests/consumer/test_user_consumer.py

@@ -6,43 +6,6 @@
     "name": "UserService"
   },
   "interactions": [
-    {
-      "description": "a request for UserA",
-      "providerState": "UserA exists and is not an administrator",
-      "request": {
-        "method": "get",
-        "path": "/users/UserA"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-        },
-        "body": {
-          "name": "UserA",
-          "id": "fc763eba-0905-41c5-a27f-3934ab26786c",
-          "created_on": "2016-12-15T20:16:01",
-          "ip_address": "127.0.0.1",
-          "admin": false
-        },
-        "matchingRules": {
-          "$.body": {
-            "match": "type"
-          },
-          "$.body.id": {
-            "match": "regex",
-            "regex": "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
-          },
-          "$.body.created_on": {
-            "match": "regex",
-            "regex": "\\d+-\\d+-\\d+T\\d+:\\d+:\\d+"
-          },
-          "$.body.ip_address": {
-            "match": "regex",
-            "regex": "(\\d{1,3}\\.)+\\d{1,3}"
-          }
-        }
-      }
-    },
     {
       "description": "a request for UserA",
       "providerState": "UserA does not exist",

examples/e2e/tests/consumer/userserviceclient-userservice.json

@@ -2,7 +2,6 @@
 
 import logging
 import os
-from testcontainers.compose import DockerCompose
 
 from pact import Verifier
 import pytest
@@ -21,31 +20,25 @@
 PACT_BROKER_PASSWORD = "pactbroker"
 
 PACT_MOCK_HOST = 'localhost'
-PACT_MOCK_PORT = 1235
+PACT_MOCK_PORT = 5001
 PACT_URL = "http://{}:{}".format(PACT_MOCK_HOST, PACT_MOCK_PORT)
 PACT_DIR = os.path.dirname(os.path.realpath(__file__))
 
+@pytest.fixture
+def default_opts():
+    return {
+        'broker_username': PACT_BROKER_USERNAME,
+        'broker_password': PACT_BROKER_PASSWORD,
+        'broker_url': PACT_BROKER_URL
+    }
 
-def test_get_user_non_admin():
+
+def test_get_user_non_admin(default_opts):
     verifier = Verifier(provider='UserService',
                         provider_base_url=PACT_URL)
 
-    output, logs = verifier.verify_pacts('./userserviceclient-userservice.json',
-                                         verbose=False,
-                                         provider_states_setup_url="{}/_pact/provider_states".format(PACT_URL))
+    output, logs = verifier.verify_with_broker(**default_opts,
+                                               verbose=True,
+                                               provider_states_setup_url="{}/_pact/provider_states".format(PACT_URL))
 
     assert (output == 0)
-
-
-# @pytest.fixture(scope='session')
-# def broker():
-#     print('Starting broker')
-#     with DockerCompose("../broker",
-#                        compose_file_name=["docker-compose.yml"],
-#                        pull=True) as compose:
-
-#         stdout, stderr = compose.get_logs()
-#         if stderr:
-#             print("Errors\\n:{}".format(stderr))
-#         print(stdout)
-#         yield