Browse Source

Merge "Import "oslo_config.cfg" before "eventlet"" into stable/queens

changes/49/763349/1
Zuul 5 months ago
committed by Gerrit Code Review
parent
commit
e22434764c
2 changed files with 6 additions and 1 deletions
  1. +2
    -0
      neutron/tests/fullstack/cmd/l3_agent.py
  2. +4
    -1
      neutron/tests/functional/agent/linux/bin/ipt_binname.py

+ 2
- 0
neutron/tests/fullstack/cmd/l3_agent.py View File

@ -15,6 +15,8 @@
import sys
from oslo_config import cfg # noqa
from neutron.common import eventlet_utils
from neutron.tests.common.agents import l3_agent


+ 4
- 1
neutron/tests/functional/agent/linux/bin/ipt_binname.py View File

@ -20,7 +20,7 @@ from __future__ import print_function
import sys
import eventlet
from oslo_config import cfg # noqa
def print_binary_name():
@ -32,6 +32,9 @@ def print_binary_name():
print(iptables_manager.binary_name)
if __name__ == "__main__":
import eventlet
if 'spawn' in sys.argv:
eventlet.spawn(print_binary_name).wait()
else:


Loading…
Cancel
Save