Merge pull request #147 from pact-foundation/feat/add_logging_params

Added logging params

Author: elliottmurray

examples/e2e/tests/userserviceclient-userservice.json

@@ -19,8 +19,9 @@
         },
         "body": {
           "name": "UserA",
-          "id": "00000000-0000-4000-a000-000000000000",
+          "id": "fc763eba-0905-41c5-a27f-3934ab26786c",
           "created_on": "2016-12-15T20:16:01",
+          "ip_address": "127.0.0.1",
           "admin": false
         },
         "matchingRules": {
@@ -29,11 +30,15 @@
           },
           "$.body.id": {
             "match": "regex",
-            "regex": "^[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}\\Z"
+            "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}"
           }
         }
       }

pact/verify.py

@@ -9,10 +9,7 @@
 
 from .constants import VERIFIER_PATH
 
-if sys.version_info.major == 2:
-    import subprocess32 as subprocess
-else:
-    import subprocess
+import subprocess
 
 
 @click.command()
@@ -104,10 +101,20 @@
     '--verbose/--no-verbose',
     default=False,
     help='Toggle verbose logging, defaults to False.')
+@click.option(
+    '--verbose/--no-verbose',
+    default=False,
+    help='Toggle verbose logging, defaults to False.')
+@click.option(
+    'log_dir', '--log-dir',
+    help='The directory for the pact.log file.')
+@click.option(
+    'log_level', '--log-level',
+    help='The logging level.')
 def main(pacts, base_url, pact_url, pact_urls, states_url, states_setup_url,
          username, broker_base_url, consumer_version_tag, provider_version_tag,
          password, token, provider, headers, timeout, provider_app_version,
-         publish_verification_results, verbose):
+         publish_verification_results, verbose, log_dir, log_level):
     """
     Verify one or more contracts against a provider service.
 
@@ -151,7 +158,9 @@ def main(pacts, base_url, pact_url, pact_urls, states_url, states_setup_url,
         '--pact-broker-base-url': broker_base_url,
         '--provider': provider,
         '--broker-password': password,
-        '--broker-token': token
+        '--broker-token': token,
+        '--log-dir': log_dir,
+        '--log-level': log_level
     }
 
     command = [VERIFIER_PATH]

tests/test_verify.py

@@ -159,6 +159,8 @@ def test_all_url_options(self):
             '--provider=provider',
             '--publish-verification-results',
             '--provider-app-version=1.2.3',
+            '--log-dir=tmp/logs/pact.test.log',
+            '--log-level=INFO',
             '--timeout=60',
             '--verbose'
         ])
@@ -182,6 +184,8 @@ def test_all_url_options(self):
             '--provider=provider',
             '--publish-verification-results',
             '--provider-app-version', '1.2.3',
+            '--log-dir=tmp/logs/pact.test.log',
+            '--log-level=INFO',
             '--verbose')
 
     def test_all_broker_options(self):