Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Commit

Permalink
Poppy metrics api and unit tests bugs fixed
Browse files Browse the repository at this point in the history
Change-Id: I4e832065d146485ad24af0b5558d0d88a82d2269
  • Loading branch information
Mohan Madhavan committed May 4, 2016
1 parent b437289 commit 32e5f92
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion poppy/provider/akamai/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -1265,7 +1265,7 @@ def get_metrics_by_domain(self, project_id, domain_name, regions,
unquoted_metric_name = parse.unquote(
metric_name.split('_')[2]
).lower()
if region.lower() == unquoted_metric_name:
if region.lower().replace(' ', '') == unquoted_metric_name:
formatted_results[metricType][region].append(
metrics_response
)
Expand Down
1 change: 1 addition & 0 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
-r provider/fastly.txt
-r provider/maxcdn.txt
-r distributed_task/taskflow.txt
-r metrics/blueflood.txt
22 changes: 18 additions & 4 deletions tests/unit/metrics/blueflood/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,22 @@

import uuid

from mock import MagicMock

from poppy.metrics.blueflood.utils import client

from tests.unit import base

import requests_mock


class ResponseMocked(object):

def __init__(self):
self.status_code = 200
self.text = 'Success'


class TestBlueFloodClient(base.TestCase):

def setUp(self):
Expand All @@ -42,6 +51,10 @@ def setUp(self):
executors=self.executors
)

self.mockedResponse = ResponseMocked()
self.bf_client.async_requests = MagicMock(
return_value=self.mockedResponse)

def test_client_init(self):

self.assertEqual(self.project_id, self.bf_client.project_id)
Expand All @@ -51,16 +64,17 @@ def test_client_init(self):
sorted(self.bf_client.headers.items()))

def test_client_async_results(self):
results = []
re_ordered_urls = []
urls = ["http://blueflood.com/{0}/views/{1}".format(
self.project_id, i) for i in range(10)]
with requests_mock.mock() as req_mock:
for url in urls:
req_mock.get(url, text='Success')
results = self.bf_client.async_requests(urls)
re_ordered_urls = []
for url in urls:
results.append(self.bf_client.async_requests(url))
re_ordered_urls.append(url)
for result in results:
self.assertEqual(result.status_code, 200)
self.assertEqual(result.text, 'Success')
re_ordered_urls.append(result.url)

self.assertEqual(sorted(urls), sorted(re_ordered_urls))

0 comments on commit 32e5f92

Please sign in to comment.