openstack/monasca-common
Code Issues Proposed changes

Clean imports in code

Browse Source 
In some part in the code we import objects. In the Openstack style
guidelines they recommend to import only modules.

http://docs.openstack.org/developer/hacking/#imports

Change-Id: Icc97b8d76901b8807bf04737bc1f72b5393e2879
This commit is contained in:
Nguyen Hung Phuong 2016-09-16 12:34:08 +07:00 committed by Tomasz Trębski
parent 0a261ef5a2
commit d8c0655b37
2 changed files with 12 additions and 11 deletions
monasca_common/tests
test_kafka.pytest_rest.py

8
monasca_common/tests/test_kafka.py

@ -13,8 +13,8 @@
import mock
import unittest
from monasca_common.kafka.consumer import KafkaConsumer
from monasca_common.kafka.producer import KafkaProducer
from monasca_common.kafka import consumer
from monasca_common.kafka import producer
FAKE_KAFKA_URL = "kafka_url"
@ -33,7 +33,7 @@ class TestKafkaProducer(unittest.TestCase):
self.mock_kafka_producer = self.kafka_producer_patcher.start()
self.producer = self.mock_kafka_producer.KeyedProducer.return_value
self.client = self.mock_kafka_client.KafkaClient.return_value
self.monasca_kafka_producer = KafkaProducer(FAKE_KAFKA_URL)
self.monasca_kafka_producer = producer.KafkaProducer(FAKE_KAFKA_URL)
def tearDown(self):
self.kafka_producer_patcher.stop()
@ -100,7 +100,7 @@ class TestKafkaConsumer(unittest.TestCase):
self.client = self.mock_kafka_client.KafkaClient.return_value
self.consumer = self.mock_kafka_consumer.SimpleConsumer.return_value
self.monasca_kafka_consumer = KafkaConsumer(
self.monasca_kafka_consumer = consumer.KafkaConsumer(
FAKE_KAFKA_URL, FAKE_ZOOKEEPER_URL, FAKE_ZOOKEEPER_PATH,
FAKE_KAFKA_CONSUMER_GROUP, FAKE_KAFKA_TOPIC)

15
monasca_common/tests/test_rest.py

@ -13,9 +13,7 @@
import mock
import unittest
from monasca_common.rest.exceptions import DataConversionException
from monasca_common.rest.exceptions import UnreadableContentError
from monasca_common.rest.exceptions import UnsupportedContentTypeException
from monasca_common.rest import exceptions
from monasca_common.rest import utils
@ -47,13 +45,14 @@ class TestRestUtils(unittest.TestCase):
self.mock_json.loads.side_effect = Exception
payload = mock.Mock()
self.assertRaises(DataConversionException, utils.read_body, payload)
self.assertRaises(exceptions.DataConversionException,
utils.read_body, payload)
def test_read_body_unsupported_content_type(self):
unsupported_content_type = mock.Mock()
self.assertRaises(
UnsupportedContentTypeException, utils.read_body, None,
exceptions.UnsupportedContentTypeException, utils.read_body, None,
unsupported_content_type)
def test_read_body_unreadable_content_error(self):
@ -61,7 +60,8 @@ class TestRestUtils(unittest.TestCase):
unreadable_content.read.side_effect = Exception
self.assertRaises(
UnreadableContentError, utils.read_body, unreadable_content)
exceptions.UnreadableContentError,
utils.read_body, unreadable_content)
def test_as_json_success(self):
data = mock.Mock()
@ -74,4 +74,5 @@ class TestRestUtils(unittest.TestCase):
data = mock.Mock()
self.mock_json.dumps.side_effect = Exception
self.assertRaises(DataConversionException, utils.as_json, data)
self.assertRaises(exceptions.DataConversionException,
utils.as_json, data)