Merge branch 'master' into remove-stats-from-send

This commit is contained in:
Leo Hemsted
2016-07-29 11:08:42 +01:00
16 changed files with 127 additions and 96 deletions

View File

@@ -216,15 +216,6 @@ def mock_delete_service(mocker, mock_get_service):
'app.service_api_client.delete_service', side_effect=_delete)
@pytest.fixture(scope='function')
def mock_get_service_statistics(mocker):
def _create(service_id, limit_days=None):
return {'data': [{}]}
return mocker.patch(
'app.statistics_api_client.get_statistics_for_service', side_effect=_create)
@pytest.fixture(scope='function')
def mock_get_aggregate_service_statistics(mocker):
def _create(service_id, limit_days=None):