Skip to content

Commit

Permalink
feat: refactoring to prepare verify
Browse files Browse the repository at this point in the history
  • Loading branch information
@elliottmurray
elliottmurray committed Jul 24, 2021
1 parent 2b67e39 commit 60ac756
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 51 deletions.
10 changes: 5 additions & 5 deletions pact/cli/verify.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,11 @@ def main(pacts, base_url, pact_url, pact_urls, states_url, states_setup_url,
options = dict(filter(lambda item: is_empty_list(item), options.items()))

success, logs = VerifyWrapper().verify(*all_pact_urls,
provider=provider,
provider_base_url=base_url,
enable_pending=enable_pending,
include_wip_pacts_since=include_wip_pacts_since,
**options)
provider=provider,
provider_base_url=base_url,
enable_pending=enable_pending,
include_wip_pacts_since=include_wip_pacts_since,
**options)
sys.exit(success)


Expand Down
1 change: 0 additions & 1 deletion pact/ffi/ffi_verifier.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ def version(self):
result = lib.pactffi_version()
return ffi.string(result).decode('utf-8')


def verify(self):
"""Call verify method."""
ffi = FFI()
Expand Down
18 changes: 9 additions & 9 deletions pact/verifier.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ def verify_pacts(self, *pacts, enable_pending=False, include_wip_pacts_since=Non

options = self.extract_params(**kwargs)
success, logs = VerifyWrapper().verify(*pacts,
provider=self.provider,
provider_base_url=self.provider_base_url,
enable_pending=enable_pending,
include_wip_pacts_since=include_wip_pacts_since,
**options)
provider=self.provider,
provider_base_url=self.provider_base_url,
enable_pending=enable_pending,
include_wip_pacts_since=include_wip_pacts_since,
**options)

return success, logs

Expand Down Expand Up @@ -91,10 +91,10 @@ def verify_with_broker(self, enable_pending=False, include_wip_pacts_since=None,
options.update(self.extract_params(**kwargs))

success, logs = VerifyWrapper().verify(provider=self.provider,
provider_base_url=self.provider_base_url,
enable_pending=enable_pending,
include_wip_pacts_since=include_wip_pacts_since,
**options)
provider_base_url=self.provider_base_url,
enable_pending=enable_pending,
include_wip_pacts_since=include_wip_pacts_since,
**options)
return success, logs

def extract_params(self, **kwargs):
Expand Down
72 changes: 36 additions & 36 deletions tests/test_verify_wrapper.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ def test_pact_urls_provided(self):
wrapper = VerifyWrapper()

result, output = wrapper.verify('./pacts/consumer-provider.json',
'./pacts/consumer-provider2.json',
provider='test_provider',
provider_base_url='http://localhost')
'./pacts/consumer-provider2.json',
provider='test_provider',
provider_base_url='http://localhost')

self.assertProcess(*self.default_call)
self.assertEqual(result, 0)
Expand All @@ -112,18 +112,18 @@ def test_all_url_options(self, mock_isfile):
wrapper = VerifyWrapper()

result, output = wrapper.verify('./pacts/consumer-provider5.json',
'./pacts/consumer-provider3.json',
provider_base_url='http://localhost',
provider_states_setup_url='http://localhost/provider-states/set',
provider='provider',
provider_app_version='1.2.3',
custom_provider_headers=['Authorization: Basic cGFj', 'CustomHeader: somevalue'],
log_dir='tmp/logs/pact.test.log',
log_level='INFO',
timeout=60,
verbose=True,
enable_pending=True,
include_wip_pacts_since='2018-01-01')
'./pacts/consumer-provider3.json',
provider_base_url='http://localhost',
provider_states_setup_url='http://localhost/provider-states/set',
provider='provider',
provider_app_version='1.2.3',
custom_provider_headers=['Authorization: Basic cGFj', 'CustomHeader: somevalue'],
log_dir='tmp/logs/pact.test.log',
log_level='INFO',
timeout=60,
verbose=True,
enable_pending=True,
include_wip_pacts_since='2018-01-01')

self.assertEqual(result, 0)
self.mock_Popen.return_value.wait.assert_called_once_with()
Expand All @@ -149,13 +149,13 @@ def test_uses_broker_if_no_pacts_and_provider_required(self):
wrapper = VerifyWrapper()

result, output = wrapper.verify(provider='test_provider',
provider_base_url='http://localhost',
broker_username='username',
broker_password='pwd',
broker_token='token',
broker_url='http://broker',
consumer_tags=['prod', 'dev'],
provider_tags=['dev', 'qa'])
provider_base_url='http://localhost',
broker_username='username',
broker_password='pwd',
broker_token='token',
broker_url='http://broker',
consumer_tags=['prod', 'dev'],
provider_tags=['dev', 'qa'])

self.assertProcess(*self.broker_call)
self.assertEqual(result, 0)
Expand All @@ -169,9 +169,9 @@ def test_rerun_command_called(self, mock_rerun_cmd, mock_expand_dirs, mock_sanit
wrapper = VerifyWrapper()

result, output = wrapper.verify('path/to/pact1',
'path/to/pact2',
provider_base_url='http://localhost',
provider='provider')
'path/to/pact2',
provider_base_url='http://localhost',
provider='provider')

mock_rerun_cmd.assert_called_once()

Expand All @@ -184,9 +184,9 @@ def test_sanitize_called(self, mock_rerun_cmd, mock_expand_dirs, mock_sanitize_l
wrapper = VerifyWrapper()

result, output = wrapper.verify('path/to/pact1',
'path/to/pact2',
provider_base_url='http://localhost',
provider='provider')
'path/to/pact2',
provider_base_url='http://localhost',
provider='provider')

mock_sanitize_logs.assert_called_with(self.mock_Popen.return_value, False)

Expand All @@ -197,11 +197,11 @@ def test_publishing_with_version(self, mock_sanitize_logs, mock_path_exists):
wrapper = VerifyWrapper()

result, output = wrapper.verify('./pacts/consumer-provider.json',
'./pacts/consumer-provider2.json',
provider='test_provider',
provider_base_url='http://localhost',
provider_app_version='1.2.3',
publish_verification_results=True)
'./pacts/consumer-provider2.json',
provider='test_provider',
provider_base_url='http://localhost',
provider_app_version='1.2.3',
publish_verification_results=True)

self.default_call.extend(['--provider-app-version', '1.2.3', '--publish-verification-results'])

Expand All @@ -217,9 +217,9 @@ def test_expand_dirs_called(self, mock_rerun_cmd, mock_expand_dirs, mock_sanitiz
wrapper = VerifyWrapper()

result, output = wrapper.verify('path/to/pact1',
'path/to/pact2',
provider_base_url='http://localhost',
provider='provider')
'path/to/pact2',
provider_base_url='http://localhost',
provider='provider')

mock_expand_dirs.assert_called_with(['path/to/pact1',
'path/to/pact2'])
Expand Down

0 comments on commit 60ac756

Please sign in to comment.