Merge "String to byte conversion should provide the encoding type" into stable/stein
This commit is contained in:
commit
59f8fd86ce
|
@ -24,6 +24,7 @@ import mock
|
||||||
from neutron_lib import worker as neutron_worker
|
from neutron_lib import worker as neutron_worker
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
import psutil
|
import psutil
|
||||||
|
import six
|
||||||
|
|
||||||
from neutron.common import utils
|
from neutron.common import utils
|
||||||
from neutron import manager
|
from neutron import manager
|
||||||
|
@ -221,7 +222,7 @@ class TestWsgiServer(TestNeutronServer):
|
||||||
|
|
||||||
# Memorize a port that was chosen for the service
|
# Memorize a port that was chosen for the service
|
||||||
self.port = server.port
|
self.port = server.port
|
||||||
os.write(self.pipeout, bytes(self.port))
|
os.write(self.pipeout, six.b(str(self.port)))
|
||||||
|
|
||||||
server.wait()
|
server.wait()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue