openstack
/
octavia
Code Issues Proposed changes

Do not use __builtin__ in python3 

__builtin__ does not exist in Python 3, use
six.moves.builtins instead.

Change-Id: I58d456669abcbc58c9a3df8f15f24996a71b299b
closes-bug: #1290234
This commit is contained in:
Shuquan Huang 2015-12-30 21:51:29 +08:00 committed by Adam Harwell
parent 3b34e08516
commit 6e51606b56
4 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py
View File

@ -19,6 +19,7 @@ import subprocess
import mock
import netifaces
import six
import six.moves.builtins as builtins
from octavia.amphorae.backends.agent import api_server
from octavia.amphorae.backends.agent.api_server import certificate_update
@ -31,11 +32,6 @@ import octavia.tests.unit.base as base
RANDOM_ERROR = 'random error'
OK = dict(message='OK')
if six.PY2:
import __builtin__ as builtins
else:
import builtins
class ServerTestCase(base.TestCase):
app = None

6
octavia/tests/functional/amphorae/backend/agent/api_server/test_server_sysvinit.py
View File

@ -20,6 +20,7 @@ import mock
import netifaces
from oslo_config import cfg
import six
import six.moves.builtins as builtins
from octavia.amphorae.backends.agent import api_server
from octavia.amphorae.backends.agent.api_server import certificate_update
@ -32,11 +33,6 @@ import octavia.tests.unit.base as base
RANDOM_ERROR = 'random error'
OK = dict(message='OK')
if six.PY2:
import __builtin__ as builtins
else:
import builtins
class ServerTestCase(base.TestCase):
app = None

20
octavia/tests/unit/amphorae/backends/agent/api_server/test_listener.py
View File

@ -13,7 +13,7 @@
# under the License.
import mock
import six
import six.moves.builtins as builtins
from octavia.amphorae.backends.agent.api_server import listener
from octavia.amphorae.drivers.haproxy.jinja import jinja_cfg
@ -21,10 +21,6 @@ from octavia.common import constants as consts
import octavia.tests.unit.base as base
from octavia.tests.unit.common.sample_configs import sample_configs
BUILTINS = '__builtin__'
if six.PY3:
BUILTINS = 'builtins'
BASE_AMP_PATH = '/var/lib/octavia'
BASE_CRT_PATH = BASE_AMP_PATH + '/certs'
@ -48,7 +44,7 @@ class ListenerTestCase(base.TestCase):
m = mock.mock_open(read_data=rendered_obj)
with mock.patch('%s.open' % BUILTINS, m, create=True):
with mock.patch.object(builtins, 'open', m, create=True):
res = listener._parse_haproxy_file('123')
self.assertEqual('TERMINATED_HTTPS', res['mode'])
self.assertEqual('/var/lib/octavia/sample_listener_id_1.sock',
@ -68,7 +64,7 @@ class ListenerTestCase(base.TestCase):
m = mock.mock_open(read_data=rendered_obj)
with mock.patch('%s.open' % BUILTINS, m, create=True):
with mock.patch.object(builtins, 'open', m, create=True):
res = listener._parse_haproxy_file('123')
self.assertEqual('TERMINATED_HTTPS', res['mode'])
self.assertEqual(BASE_AMP_PATH + '/sample_listener_id_1.sock',
@ -82,7 +78,7 @@ class ListenerTestCase(base.TestCase):
sample_configs.sample_listener_tuple())
m = mock.mock_open(read_data=rendered_obj)
with mock.patch('%s.open' % BUILTINS, m, create=True):
with mock.patch.object(builtins, 'open', m, create=True):
res = listener._parse_haproxy_file('123')
self.assertEqual('HTTP', res['mode'])
self.assertEqual(BASE_AMP_PATH + '/sample_listener_id_1.sock',
@ -94,7 +90,7 @@ class ListenerTestCase(base.TestCase):
sample_configs.sample_listener_tuple(proto='HTTPS'))
m = mock.mock_open(read_data=rendered_obj)
with mock.patch('%s.open' % BUILTINS, m, create=True):
with mock.patch.object(builtins, 'open', m, create=True):
res = listener._parse_haproxy_file('123')
self.assertEqual('TCP', res['mode'])
self.assertEqual(BASE_AMP_PATH + '/sample_listener_id_1.sock',
@ -104,7 +100,7 @@ class ListenerTestCase(base.TestCase):
# Bogus format
m = mock.mock_open(read_data='Bogus')
with mock.patch('%s.open' % BUILTINS, m, create=True):
with mock.patch.object(builtins, 'open', m, create=True):
try:
res = listener._parse_haproxy_file('123')
self.fail("No Exception?")
@ -147,7 +143,7 @@ class ListenerTestCase(base.TestCase):
mock_exists.return_value = False
cmd = 'haproxy-vrrp-check ' + ' '.join(['listener.sock']) + '; exit $?'
m = mock.mock_open()
with mock.patch('%s.open' % BUILTINS, m, create=True):
with mock.patch.object(builtins, 'open', m, create=True):
listener.vrrp_check_script_update('123', 'stop')
handle = m()
handle.write.assert_called_once_with(cmd)
@ -157,7 +153,7 @@ class ListenerTestCase(base.TestCase):
'listener.sock']) + '; exit '
'$?')
m = mock.mock_open()
with mock.patch('%s.open' % BUILTINS, m, create=True):
with mock.patch.object(builtins, 'open', m, create=True):
listener.vrrp_check_script_update('123', 'start')
handle = m()
handle.write.assert_called_once_with(cmd)

11
octavia/tests/unit/controller/worker/tasks/test_compute_tasks.py
View File

@ -17,18 +17,13 @@ import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils
import six
import six.moves.builtins as builtins
from octavia.common import constants
from octavia.common import exceptions
from octavia.controller.worker.tasks import compute_tasks
import octavia.tests.unit.base as base
BUILTINS = '__builtin__'
if six.PY3:
BUILTINS = 'builtins'
AMP_FLAVOR_ID = 10
AMP_IMAGE_ID = 11
AMP_SSH_KEY_NAME = None
@ -194,7 +189,7 @@ class TestComputeTasks(base.TestCase):
mock_driver.build.return_value = COMPUTE_ID
m = mock.mock_open(read_data='test')
with mock.patch('%s.open' % BUILTINS, m, create=True):
with mock.patch.object(builtins, 'open', m, create=True):
# Test execute()
compute_id = createcompute.execute(_amphora_mock.id,
'test_cert')
@ -217,7 +212,7 @@ class TestComputeTasks(base.TestCase):
assert(compute_id == COMPUTE_ID)
# Test that a build exception is raised
with mock.patch('%s.open' % BUILTINS, m, create=True):
with mock.patch.object(builtins, 'open', m, create=True):
createcompute = compute_tasks.ComputeCreate()
self.assertRaises(TypeError,
createcompute.execute,