Removed deprecated tests function
Change I790777ddcbd1b02218b3db54ae3d5c931d72d4fa deprecated functions: get_related_rand_names, get_rand_name, get_rand_device_name, get_related_rand_device_names in neutron.tests.* to allow separation of neutron code and neutron tests. Change-Id: I04e2fb87572d825fa736c66266dc6ec9855b93f9 Related-Bug: #1621782
This commit is contained in:
parent
70462de005
commit
bea8985d78
|
@ -23,10 +23,8 @@ import gc
|
|||
import inspect
|
||||
import os
|
||||
import os.path
|
||||
import sys
|
||||
import weakref
|
||||
|
||||
from debtcollector import moves
|
||||
import eventlet.timeout
|
||||
import fixtures
|
||||
import mock
|
||||
|
@ -47,7 +45,6 @@ from neutron.callbacks import manager as registry_manager
|
|||
from neutron.callbacks import registry
|
||||
from neutron.common import config
|
||||
from neutron.common import rpc as n_rpc
|
||||
from neutron.common import utils
|
||||
from neutron.db import agentschedulers_db
|
||||
from neutron import manager
|
||||
from neutron import policy
|
||||
|
@ -72,16 +69,6 @@ def fake_use_fatal_exceptions(*args):
|
|||
return True
|
||||
|
||||
|
||||
for _name in ('get_related_rand_names',
|
||||
'get_rand_name',
|
||||
'get_rand_device_name',
|
||||
'get_related_rand_device_names'):
|
||||
setattr(sys.modules[__name__], _name, moves.moved_function(
|
||||
getattr(utils, _name), _name, __name__,
|
||||
message='use "neutron.common.utils.%s" instead' % _name,
|
||||
version='Newton', removal_version='Ocata'))
|
||||
|
||||
|
||||
def bool_from_env(key, strict=False, default=False):
|
||||
value = os.environ.get(key)
|
||||
return strutils.bool_from_string(value, strict=strict, default=default)
|
||||
|
|
|
@ -12,10 +12,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from debtcollector import moves
|
||||
import testscenarios
|
||||
|
||||
from neutron.common import utils
|
||||
from neutron.tests.functional import base
|
||||
|
||||
|
||||
|
@ -27,12 +25,6 @@ MARKED_BLOCK_RULE = '-m mark --mark %s -j DROP' % MARK_VALUE
|
|||
ICMP_BLOCK_RULE = '-p icmp -j DROP'
|
||||
|
||||
|
||||
get_rand_name = moves.moved_function(
|
||||
utils.get_rand_name, 'get_rand_name', __name__,
|
||||
message='use "neutron.common.utils.get_rand_name" instead',
|
||||
version='Newton', removal_version='Ocata')
|
||||
|
||||
|
||||
# Regarding MRO, it goes BaseOVSLinuxTestCase, WithScenarios,
|
||||
# BaseSudoTestCase, ..., UnitTest, object. setUp is not defined in
|
||||
# WithScenarios, so it will correctly be found in BaseSudoTestCase.
|
||||
|
|
Loading…
Reference in New Issue