Build ceilometer 2015.1.0 (stable/kilo)
[openstack-build/ceilometer-build.git] / trusty / debian / patches / disable-kafka.patch
1 --- a/ceilometer/tests/publisher/test_kafka_broker_publisher.py
2 +++ b/ceilometer/tests/publisher/test_kafka_broker_publisher.py
3 @@ -15,13 +15,17 @@
4  """Tests for ceilometer/publisher/kafka_broker.py
5  """
6  import datetime
7 +import testtools
8  import uuid
9  
10  import mock
11  from oslo_utils import netutils
12  
13  from ceilometer.event.storage import models as event
14 -from ceilometer.publisher.kafka_broker import KafkaBrokerPublisher
15 +try:
16 +    from ceilometer.publisher.kafka_broker import KafkaBrokerPublisher
17 +except ImportError:
18 +    kafka_publisher = None
19  from ceilometer import sample
20  from ceilometer.tests import base as tests_base
21  
22 @@ -93,6 +97,7 @@
23          ),
24      ]
25  
26 +    @testtools.skipIf(kafka_publisher is None, "Kafka not avaliable, skipping")
27      def setUp(self):
28          super(TestKafkaPublisher, self).setUp()
29  
30 --- a/requirements.txt
31 +++ b/requirements.txt
32 @@ -9,7 +9,6 @@
33  iso8601>=0.1.9
34  jsonpath-rw>=1.2.0,<2.0
35  jsonschema>=2.0.0,<3.0.0
36 -kafka-python>=0.9.2 # Apache-2.0
37  keystonemiddleware>=1.5.0,<1.6.0
38  lxml>=2.3
39  msgpack-python>=0.4.0