x
/
poppy
Code Issues Proposed changes

Fix skipped tests while running tox 

The exclude option passed to tox uses regex to filter
tests by name. We had a few unit and functional that
had substring 'api' as part of the name that were getting
skipped inadvertently.

Change-Id: I937c9f5a7562d1b3f6ab4a2c4025de1360ddfb9d
This commit is contained in:
Isaac Mungai 2016-05-02 18:45:58 -04:00
parent 83dea78728
commit dd82ab71bb
6 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/etc/default_functional.conf
View File

@ -21,6 +21,7 @@ consumer_key = "MYCONSUMERKEY"
[drivers:provider:akamai]
akamai_https_access_url_suffix = "my_https_url_suffix"
san_cert_cnames = secure1.test_san.com,secure2.test_san.com
[drivers:provider:cloudfront]
aws_access_key_id = "MY_AWS_ACCESS_KEY_ID"

9
tests/functional/transport/pecan/controllers/data_post_background_jobs.json
View File

@ -8,7 +8,12 @@
},
"akamai_update_papi_property_for_mod_san": {
"job_type": "akamai_update_papi_property_for_mod_san",
"domain_name": "www.abc.com",
"san_cert_name": "secure1.test_san.com"
"update_cname_host_mapping_info": [
{
"domain_name": "www.abc.com",
"san_cert_name": "secure1.test_san.com"
}
],
"san_cert_domain_suffix": "test_san.com"
}
}

14
tests/unit/provider/akamai/background_jobs/akamai_mocks.py
View File

@ -56,6 +56,10 @@ class MockManager(mock.Mock):
@property
def providers(self):
return self.get_providers()
@staticmethod
def get_providers():
akamai_mock_provider = mock.Mock()
akamai_mock_provider_obj = mock.Mock()
akamai_mock_provider_obj.service_controller = mock.Mock()
@ -81,6 +85,10 @@ class MockManager(mock.Mock):
@property
def services_controller(self):
return self.get_services_controller()
@staticmethod
def get_services_controller():
sc = mock.Mock()
sc.storage_controller = MockStorageController()
return sc
@ -129,7 +137,7 @@ class MockPapiAPIClient(mock.Mock):
self.response_200 = mock.Mock(status_code=200)
def get(self, url):
if 'hostnames' in url:
if 'hostnames' in url and 'versions' in url:
self.response_200.text = json.dumps({
"accountId": "act_1-ABCDE",
"contractId": "B-ABCDE",
@ -152,6 +160,8 @@ class MockPapiAPIClient(mock.Mock):
}]
}
})
self.response_200.status_code = 200
return self.response_200
if 'edgehostnames' in url:
self.response_200.text = json.dumps({
"accountId": "act_1-ABCDE",
@ -179,6 +189,8 @@ class MockPapiAPIClient(mock.Mock):
}]
}
})
self.response_200.status_code = 200
return self.response_200
if 'activations' in url:
self.response_200.text = json.dumps({
"activationId": "atv_2511473",

27
tests/unit/provider/akamai/background_jobs/test_flows.py
View File

@ -30,6 +30,33 @@ class TestAkamaiBJFlowRuns(base.TestCase):
def setUp(self):
super(TestAkamaiBJFlowRuns, self).setUp()
def task_controllers_side_effect(*args, **kwargs):
if args[0] == 'poppy':
if args[1] == 'providers':
return (
akamai_mocks.MockManager.get_services_controller(),
akamai_mocks.MockManager.get_providers()
)
if args[1] == 'storage':
return (
akamai_mocks.MockManager.get_services_controller(),
akamai_mocks.MockManager.get_services_controller().
storage_controller
)
mock_task_controllers = mock.Mock()
mock_task_controllers.task_controllers.side_effect = (
task_controllers_side_effect
)
memo_controllers_patcher = mock.patch(
# 'poppy.distributed_task.utils.memoized_controllers',
'poppy.provider.akamai.background_jobs.'
'check_cert_status_and_update.'
'check_cert_status_and_update_tasks.memoized_controllers',
new=mock_task_controllers
)
memo_controllers_patcher.start()
self.addCleanup(memo_controllers_patcher.stop)
bootstrap_patcher = mock.patch(
'poppy.bootstrap.Bootstrap',
new=akamai_mocks.MockBootStrap

12
tests/unit/provider/akamai/test_services.py
View File

@ -825,10 +825,10 @@ class TestServices(base.TestCase):
}
lastSpsId = (
controller.san_info_storage.get_cert_last_spsid(
controller.cert_info_storage.get_cert_last_spsid(
"secure.san1.poppycdn.com"))
controller.san_info_storage.get_cert_info.return_value = {
controller.cert_info_storage.get_cert_info.return_value = {
'cnameHostname': "secure.san1.poppycdn.com",
'jobId': "secure.san1.poppycdn.com",
'issuer': 1789,
@ -837,7 +837,7 @@ class TestServices(base.TestCase):
'slot-deployment.class': 'esslType'
}
cert_info = controller.san_info_storage.get_cert_info(
cert_info = controller.cert_info_storage.get_cert_info(
"secure.san1.poppycdn.com")
cert_info['add.sans'] = "www.abc.com"
@ -882,10 +882,10 @@ class TestServices(base.TestCase):
}
lastSpsId = (
controller.san_info_storage.get_cert_last_spsid(
controller.cert_info_storage.get_cert_last_spsid(
"secure.san1.poppycdn.com"))
controller.san_info_storage.get_cert_info.return_value = {
controller.cert_info_storage.get_cert_info.return_value = {
'cnameHostname': "secure.san1.poppycdn.com",
'jobId': "secure.san1.poppycdn.com",
'issuer': 1789,
@ -894,7 +894,7 @@ class TestServices(base.TestCase):
'slot-deployment.class': 'esslType'
}
cert_info = controller.san_info_storage.get_cert_info(
cert_info = controller.cert_info_storage.get_cert_info(
"secure.san1.poppycdn.com")
cert_info['add.sans'] = "www.abc.com"

3
tox.ini
View File

@ -20,8 +20,7 @@ deps = -r{toxinidir}/requirements/requirements.txt
-r{toxinidir}/tests/test-requirements.txt
commands = pip install -U mock==1.0.1
pip install git+https://github.com/stackforge/opencafe.git#egg=cafe
nosetests {posargs:--exclude=api --exclude=endtoend --nologcapture}
nosetests tests.unit tests.functional {posargs:--nologcapture}
[testenv:pep8]
commands = flake8