openstack
/
neutron-dynamic-routing
Code Issues Proposed changes

Merge "Make sure we return unicode strings for process output"

This commit is contained in:
Jenkins 2015-11-24 05:13:18 +00:00 committed by Gerrit Code Review
parent a836a8398d 0ae3108211
commit 4f79df1eaf
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/tests/common/helpers.py
View File

@ -16,6 +16,8 @@ import datetime
import os
from oslo_utils import timeutils
import six
import testtools
import neutron
from neutron.common import constants
@ -151,3 +153,11 @@ def register_ovs_agent(host=HOST, agent_type=constants.AGENT_TYPE_OVS,
tunneling_ip, interface_mappings,
l2pop_network_types)
return _register_agent(agent)
def requires_py2(testcase):
return testtools.skipUnless(six.PY2, "requires python 2.x")(testcase)
def requires_py3(testcase):
return testtools.skipUnless(six.PY3, "requires python 3.x")(testcase)