From 5f4755b92bf1c63e1755842546b2e1a66c9a6658 Mon Sep 17 00:00:00 2001
From: Andrew Smith <ansmith@redhat.com>
Date: Tue, 17 Apr 2018 11:57:48 -0400
Subject: [PATCH] Add kafka for python 3 functional test

Change-Id: I743cd09e3450fac215ff65db37c3fe53e2e43601
---
 .zuul.yaml                            | 9 +++++++++
 oslo_messaging/_drivers/impl_kafka.py | 2 +-
 tox.ini                               | 7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index b00fba4d1..af7dccf71 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,6 +24,13 @@
     vars:
       tox_envlist: py35-func-amqp1
 
+- job:
+    name: oslo.messaging-tox-py35-func-kafka
+    parent: openstack-tox-py35
+    vars:
+      tox_envlist: py35-func-kafka
+      bindep_profile: kafka
+
 - job:
     name: oslo.messaging-tox-py35-func-rabbit
     parent: openstack-tox-py35
@@ -227,6 +234,8 @@
         - oslo.messaging-tox-py27-func-rabbit
         - oslo.messaging-tox-py35-func-amqp1:
             voting: false
+        - oslo.messaging-tox-py35-func-kafka:
+            voting: false
         - oslo.messaging-tox-py35-func-rabbit:
             voting: false
 
diff --git a/oslo_messaging/_drivers/impl_kafka.py b/oslo_messaging/_drivers/impl_kafka.py
index 007727c9f..b292c46cb 100644
--- a/oslo_messaging/_drivers/impl_kafka.py
+++ b/oslo_messaging/_drivers/impl_kafka.py
@@ -259,7 +259,7 @@ class ProducerConnection(Connection):
         """
         retry = retry if retry >= 0 else None
         message = pack_message(ctxt, msg)
-        message = jsonutils.dumps(message)
+        message = jsonutils.dumps(message).encode('utf-8')
 
         @with_reconnect(retries=retry)
         def wrapped_with_reconnect():
diff --git a/tox.ini b/tox.ini
index 587f1b26c..1f97130c9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,6 +75,13 @@ setenv =
     WORKDIR={toxworkdir}
 commands = {toxinidir}/tools/setup-test-env-amqp1.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
 
+[testenv:py35-func-kafka]
+setenv =
+    {[testenv]setenv}
+    TRANSPORT_URL=kafka://127.0.0.1:9092/
+    OS_GROUP_REGEX=oslo_messaging.tests.functional
+commands = {toxinidir}/setup-test-env-kafka.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
+
 [testenv:py27-func-zmq]
 basepython = python2.7
 commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'