From 7e5212706401826b37d6f653ecd43f646befb3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89douard=20Thuleau?= <ethuleau@juniper.net>
Date: Wed, 16 May 2018 20:24:51 +0200
Subject: [PATCH] [config] Follow gevent deprecated code

New gevent release 1.3 removed old deprecated wsgi code [1] used by
config unit test framework.
As that 1.3 gevent version also break the kazoo library [2], we restrict
our unit test framework to use precedent version until kazoo fix [3]
is released.

[1] http://www.gevent.org/changelog.html#b2-2018-05-03
[2] https://github.com/python-zk/kazoo/issues/505
[3] https://github.com/python-zk/kazoo/commit/257b58961f7ddd9db04d6efa070739a1b0404487

Change-Id: Iec9c02cc9b8a76d78edeabfc5c29117832983c5e
Closes-Bug: #1771644
---
 src/config/api-server/requirements.txt | 2 +-
 src/config/common/tests/test_common.py | 4 ++--
 src/config/common/tests/test_utils.py  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/config/api-server/requirements.txt b/src/config/api-server/requirements.txt
index 319dfbd1557..20d2a052a82 100644
--- a/src/config/api-server/requirements.txt
+++ b/src/config/api-server/requirements.txt
@@ -2,7 +2,7 @@ cfgm_common
 vnc_api
 sandesh
 sandesh-common
-gevent
+gevent<1.3  # removed when kazoo fix released https://github.com/python-zk/kazoo/commit/257b58961f7ddd9db04d6efa070739a1b0404487
 geventhttpclient
 pycassa>=1.7.2
 netaddr>=0.7.5
diff --git a/src/config/common/tests/test_common.py b/src/config/common/tests/test_common.py
index b6d9cba5af0..d3b96d05ed5 100644
--- a/src/config/common/tests/test_common.py
+++ b/src/config/common/tests/test_common.py
@@ -33,7 +33,7 @@
 import novaclient
 import novaclient.client
 
-import gevent.wsgi
+import gevent.pywsgi
 import uuid
 from pysandesh import sandesh_logger
 
@@ -736,7 +736,7 @@ def setUpClass(cls, extra_mocks=None, extra_config_knobs=None, db=None):
         #cov_handle.start()
 
         cfgm_common.zkclient.LOG_DIR = './'
-        gevent.wsgi.WSGIServer.handler_class = FakeWSGIHandler
+        gevent.pywsgi.WSGIServer.handler_class = FakeWSGIHandler
 
         cls.orig_mocked_values = setup_mocks(cls.mocks + (extra_mocks or []))
 
diff --git a/src/config/common/tests/test_utils.py b/src/config/common/tests/test_utils.py
index 336420618c8..ace6c472171 100644
--- a/src/config/common/tests/test_utils.py
+++ b/src/config/common/tests/test_utils.py
@@ -3,7 +3,7 @@
 #
 import gevent
 import gevent.queue
-import gevent.wsgi
+import gevent.pywsgi
 import gevent.monkey
 gevent.monkey.patch_all()
 import os
@@ -59,7 +59,7 @@ def _print(cls):
             print "\n"
 # class FakeApiConfigLog
 
-class FakeWSGIHandler(gevent.wsgi.WSGIHandler):
+class FakeWSGIHandler(gevent.pywsgi.WSGIHandler):
     logger = logging.getLogger('FakeWSGIHandler')
     logger.addHandler(logging.FileHandler('api_server.log'))
     def __init__(self, socket, address, server):