Browse Source

Merge "consume is_bsd from neutron-lib"

Zuul 1 month ago
parent
commit
25003068c9
2 changed files with 1 additions and 13 deletions
  1. 0
    12
      neutron/tests/tools.py
  2. 1
    1
      neutron/tests/unit/db/test_db_base_plugin_v2.py

+ 0
- 12
neutron/tests/tools.py View File

@@ -15,7 +15,6 @@
15 15
 
16 16
 import datetime
17 17
 import os
18
-import platform
19 18
 import random
20 19
 import time
21 20
 import warnings
@@ -334,17 +333,6 @@ def get_random_network_segment_range_network_type():
334 333
                           constants.TYPE_GENEVE])
335 334
 
336 335
 
337
-def is_bsd():
338
-    """Return True on BSD-based systems."""
339
-
340
-    system = platform.system()
341
-    if system == 'Darwin':
342
-        return True
343
-    if 'bsd' in system.lower():
344
-        return True
345
-    return False
346
-
347
-
348 336
 def reset_random_seed():
349 337
     # reset random seed to make sure other processes extracting values from RNG
350 338
     # don't get the same results (useful especially when you then use the

+ 1
- 1
neutron/tests/unit/db/test_db_base_plugin_v2.py View File

@@ -30,6 +30,7 @@ from neutron_lib.db import api as db_api
30 30
 from neutron_lib import exceptions as lib_exc
31 31
 from neutron_lib import fixture
32 32
 from neutron_lib.plugins import directory
33
+from neutron_lib.tests import tools
33 34
 from neutron_lib.utils import helpers
34 35
 from neutron_lib.utils import net
35 36
 from oslo_concurrency import lockutils
@@ -63,7 +64,6 @@ from neutron.objects import router as l3_obj
63 64
 from neutron.plugins.ml2.common import exceptions as ml2_exceptions
64 65
 from neutron import policy
65 66
 from neutron.tests import base
66
-from neutron.tests import tools
67 67
 from neutron.tests.unit.api import test_extensions
68 68
 from neutron.tests.unit import testlib_api
69 69
 

Loading…
Cancel
Save