docs(examples): removed manaul publish to broker

Author: elliottmurray

examples/e2e/README.md

@@ -36,5 +36,17 @@ pytest
 Or you can run individual tests like:
 
 ```bash
-pytest tests/test_user_consumer.py::test_get_non_existing_user
+pytest tests/consumer/test_user_consumer.py::test_get_non_existing_user
 ```
+
+To get the consumer to publish a pact to broker you will need to run (2 is an arbitary version number):
+```bash
+pytest tests/consumer/test_user_consumer.py --publish-pact 2
+```
+
+And then you can run:
+```bash
+./verify_pact.sh 2
+```
+
+To verify the pact

examples/e2e/tests/consumer/test_user_consumer.py

@@ -1,10 +1,8 @@
 """pact test for user service client"""
 
-import json
 import logging
 import os
-import requests
-from requests.auth import HTTPBasicAuth
+import atexit
 
 import pytest
 from pact import Consumer, Like, Provider, Term, Format
@@ -15,10 +13,7 @@
 logging.basicConfig(level=logging.INFO)
 print(Format().__dict__)
 
-PACT_UPLOAD_URL = (
-    "http://127.0.0.1/pacts/provider/UserService/consumer"
-    "/UserServiceClient/version"
-)
+PACT_BROKER_URL = "http://localhost"
 PACT_FILE = "userserviceclient-userservice.json"
 PACT_BROKER_USERNAME = "pactbroker"
 PACT_BROKER_PASSWORD = "pactbroker"
@@ -38,42 +33,21 @@ def consumer():
 
 @pytest.fixture(scope='session')
 def pact(request):
-    pact = Consumer('UserServiceClient').has_pact_with(
-        Provider('UserService'), host_name=PACT_MOCK_HOST, port=PACT_MOCK_PORT,
-        pact_dir=PACT_DIR)
-    try:
-        print('start service')
-        pact.start_service()
-        yield pact
-    finally:
-        print('stop service')
-        pact.stop_service()
-
     version = request.config.getoption('--publish-pact')
-    if not request.node.testsfailed and version:
-        push_to_broker(version)
-
-
-def push_to_broker(version):
-    """
-    Push to broker
-    """
-    with open(os.path.join(PACT_DIR, PACT_FILE), 'rb') as pact_file:
-        pact_file_json = json.load(pact_file)
-
-    basic_auth = HTTPBasicAuth(PACT_BROKER_USERNAME, PACT_BROKER_PASSWORD)
+    publish = True if version else False
 
-    log.info("Uploading pact file to pact broker...")
+    pact = Consumer('UserServiceClient', version=version).has_pact_with(
+        Provider('UserService'), host_name=PACT_MOCK_HOST, port=PACT_MOCK_PORT,
+        pact_dir=PACT_DIR, publish_to_broker=publish, broker_base_url=PACT_BROKER_URL,
+        broker_username=PACT_BROKER_USERNAME, broker_password=PACT_BROKER_PASSWORD)
 
-    r = requests.put(
-        "{}/{}".format(PACT_UPLOAD_URL, version),
-        auth=basic_auth,
-        json=pact_file_json
-    )
-    if not r.ok:
-        log.error("Error uploading: %s", r.content)
-        r.raise_for_status()
+    print('start service')
+    pact.start_service()
+    atexit.register(pact.stop_service)
 
+    yield pact
+    print('stop service')
+    pact.stop_service()
 
 def test_get_user_non_admin(pact, consumer):
     expected = {
@@ -93,14 +67,10 @@ def test_get_user_non_admin(pact, consumer):
      .with_request('get', '/users/UserA')
      .will_respond_with(200, body=Like(expected)))
 
-    # pact.setup()
-
     with pact:
         user = consumer.get_user('UserA')
         assert user.name == 'UserA'
 
-    # pact.verify()
-
 
 def test_get_non_existing_user(pact, consumer):
     (pact

examples/e2e/tests/provider/test_provider.py

@@ -20,7 +20,6 @@
 import os
 
 import pytest
-# from flask import Flask, abort, jsonify, request
 from multiprocessing import Process
 
 from pact import Verifier