openstack/neutron
Code Issues Proposed changes

Revert "Bump Pyroute2 version to 0.5.5"

Browse Source 
This reverts commit d2d57371dc.

Change-Id: Ic04adae9cd27ce18324d5a2b2ec1966b38eddc2b
Closes-Bug: #1829239
This commit is contained in:
YAMAMOTO Takashi 2019-05-15 13:52:59 +00:00
parent d2d57371dc
commit 4353d1b06c
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lower-constraints.txt
View File

@ -106,7 +106,7 @@ pylint==2.2.0
PyMySQL==0.7.6
pyparsing==2.1.0
pyperclip==1.5.27
pyroute2==0.5.5
pyroute2==0.5.3
python-dateutil==2.5.3
python-designateclient==2.7.0
python-editor==1.0.3

13
neutron/tests/unit/common/test_utils.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import logging
import os.path
import random
import re
@ -23,7 +22,7 @@ import eventlet
import mock
import netaddr
from neutron_lib import constants
from oslo_log import log as oslo_logging
from oslo_log import log as logging
import six
import testscenarios
import testtools
@ -303,11 +302,7 @@ class TestDelayedStringRenderer(base.BaseTestCase):
self.assertEqual("Type: Brie cheese!", string)
def test_not_called_with_low_log_level(self):
LOG = oslo_logging.getLogger(__name__)
root_logger = logging.getLogger(__name__)
if not root_logger.handlers:
root_logger.addHandler(logging.StreamHandler())
LOG = logging.getLogger(__name__)
# make sure we return logging to previous level
current_log_level = LOG.logger.getEffectiveLevel()
self.addCleanup(LOG.logger.setLevel, current_log_level)
@ -316,12 +311,12 @@ class TestDelayedStringRenderer(base.BaseTestCase):
delayed = utils.DelayedStringRenderer(my_func)
# set to warning so we shouldn't be logging debug messages
LOG.logger.setLevel(oslo_logging.WARNING)
LOG.logger.setLevel(logging.logging.WARNING)
LOG.debug("Hello %s", delayed)
self.assertFalse(my_func.called)
# but it should be called with the debug level
LOG.logger.setLevel(oslo_logging.DEBUG)
LOG.logger.setLevel(logging.logging.DEBUG)
LOG.debug("Hello %s", delayed)
self.assertTrue(my_func.called)

2
requirements.txt
View File

@ -47,7 +47,7 @@ os-ken >= 0.3.0 # Apache-2.0
ovs>=2.8.0 # Apache-2.0
ovsdbapp>=0.9.1 # Apache-2.0
psutil>=3.2.2 # BSD
pyroute2>=0.5.5;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
pyroute2>=0.5.3;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
weakrefmethod>=1.0.2;python_version=='2.7' # PSF
python-novaclient>=9.1.0 # Apache-2.0