Browse Source

Merge "String to byte conversion should provide the encoding type" into stable/stein

changes/96/750396/1
Zuul 11 months ago
committed by Gerrit Code Review
parent
commit
59f8fd86ce
  1. 3
      neutron/tests/functional/test_server.py

3
neutron/tests/functional/test_server.py

@ -24,6 +24,7 @@ import mock
from neutron_lib import worker as neutron_worker
from oslo_config import cfg
import psutil
import six
from neutron.common import utils
from neutron import manager
@ -221,7 +222,7 @@ class TestWsgiServer(TestNeutronServer):
# Memorize a port that was chosen for the service
self.port = server.port
os.write(self.pipeout, bytes(self.port))
os.write(self.pipeout, six.b(str(self.port)))
server.wait()

Loading…
Cancel
Save