Merge pull request #142 from elliottmurray/ssl_verify

Allowed https communication to mock. Didn't fix tests

Author: elliottmurray

.travis.yml

@@ -13,12 +13,13 @@ rvm: "2.2"
 
 sudo: false
 
-install: pip install -r requirements_dev.txt
+install:
+  - pip install -r requirements_dev.txt
 
 script:
   - flake8
   - pydocstyle pact
-  - tox
+  - tox -e test
   - if [[ $TRAVIS_PYTHON_VERSION == "3.5" ]]; then make package && pip install ./dist/pact-python-*.tar.gz && make e2e; fi
 
 before_deploy:

pact/pact.py

@@ -201,12 +201,13 @@ def setup(self):
         """Configure the Mock Service to ready it for a test."""
         try:
             resp = requests.delete(
-                self.uri + '/interactions', headers=self.HEADERS)
+                self.uri + '/interactions', headers=self.HEADERS, verify=False)
 
             assert resp.status_code == 200, resp.text
             resp = requests.put(
                 self.uri + '/interactions',
                 headers=self.HEADERS,
+                verify=False,
                 json={"interactions": self._interactions})
 
             assert resp.status_code == 200, resp.text
@@ -288,10 +289,10 @@ def verify(self):
         self._interactions = []
         resp = requests.get(
             self.uri + '/interactions/verification',
-            headers=self.HEADERS)
+            headers=self.HEADERS, verify=False)
         assert resp.status_code == 200, resp.text
         resp = requests.post(
-            self.uri + '/pact', headers=self.HEADERS)
+            self.uri + '/pact', headers=self.HEADERS, verify=False)
         assert resp.status_code == 200, resp.text
 
     def with_request(self, method, path, body=None, headers=None, query=None):
@@ -362,8 +363,10 @@ def _wait_for_server_start(self):
         """
         s = requests.Session()
         retries = Retry(total=9, backoff_factor=0.1)
-        s.mount('http://', HTTPAdapter(max_retries=retries))
-        resp = s.get(self.uri, headers=self.HEADERS)
+        http_mount = 'https://' if self.ssl else 'http://'
+        s.mount(http_mount, HTTPAdapter(max_retries=retries))
+
+        resp = s.get(self.uri, headers=self.HEADERS, verify=False)
         if resp.status_code != 200:
             self._process.terminate()
             self._process.communicate()

tests/test_pact.py

@@ -375,12 +375,14 @@ def setUp(self):
          .will_respond_with(200, body='success'))
 
         self.delete_call = call('delete', 'http://localhost:1234/interactions',
-                                headers={'X-Pact-Mock-Service': 'true'})
+                                headers={'X-Pact-Mock-Service': 'true'},
+                                verify=False)
 
         self.put_interactions_call = call(
             'put', 'http://localhost:1234/interactions',
             data=None,
             headers={'X-Pact-Mock-Service': 'true'},
+            verify=False,
             json={'interactions': [{
                 'response': {'status': 200, 'body': 'success'},
                 'request': {'path': '/path', 'method': 'GET'},
@@ -570,7 +572,9 @@ def test_wait_for_server_start_success(self):
         session.mount.assert_called_once_with(
             'http://', self.mock_HTTPAdapter.return_value)
         session.get.assert_called_once_with(
-            'http://localhost:1234', headers={'X-Pact-Mock-Service': 'true'})
+            'http://localhost:1234',
+            headers={'X-Pact-Mock-Service': 'true'},
+            verify=False)
         self.mock_HTTPAdapter.assert_called_once_with(
             max_retries=self.mock_Retry.return_value)
         self.mock_Retry.assert_called_once_with(total=9, backoff_factor=0.1)
@@ -588,7 +592,9 @@ def test_wait_for_server_start_failure(self):
         session.mount.assert_called_once_with(
             'http://', self.mock_HTTPAdapter.return_value)
         session.get.assert_called_once_with(
-            'http://localhost:1234', headers={'X-Pact-Mock-Service': 'true'})
+            'http://localhost:1234',
+            headers={'X-Pact-Mock-Service': 'true'},
+            verify=False)
         self.mock_HTTPAdapter.assert_called_once_with(
             max_retries=self.mock_Retry.return_value)
         self.mock_Retry.assert_called_once_with(total=9, backoff_factor=0.1)
@@ -611,12 +617,14 @@ def setUp(self):
             'get', 'http://localhost:1234/interactions/verification',
             allow_redirects=True,
             headers={'X-Pact-Mock-Service': 'true'},
+            verify=False,
             params=None)
 
         self.post_publish_pacts_call = call(
             'post', 'http://localhost:1234/pact',
             data=None,
             headers={'X-Pact-Mock-Service': 'true'},
+            verify=False,
             json=None)
 
     def test_success(self):

tox.ini

@@ -3,6 +3,6 @@ envlist=py{34,35,36,37,38}-{test,install}
 [testenv]
 deps=
     test: -rrequirements_dev.txt
-ommands=
+commands=
 	test: nosetests
 	install: python -c "import pact"