change assert(Not)Equals to assert(Not)Equal
According to http://docs.python.org/2/library/unittest.html assert(Not)Equals is a deprecated alias of assert(Not)Equal. Change-Id: Ia5df59c1f59d022231a8575cd7bc7e9bd0013ac5 Closes-Bug: #1329757
This commit is contained in:
parent
e6456473bf
commit
df4040b541
|
@ -42,22 +42,22 @@ class GeneralTests(CharmTestCase):
|
|||
def test_l2population(self):
|
||||
self.test_config.set('l2-population', True)
|
||||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.assertEquals(context.get_l2population(), True)
|
||||
self.assertEqual(context.get_l2population(), True)
|
||||
|
||||
def test_l2population_nonovs(self):
|
||||
self.test_config.set('l2-population', True)
|
||||
self.test_config.set('neutron-plugin', 'nsx')
|
||||
self.assertEquals(context.get_l2population(), False)
|
||||
self.assertEqual(context.get_l2population(), False)
|
||||
|
||||
def test_get_tenant_network_types(self):
|
||||
self.test_config.set('overlay-network-type', 'gre')
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
context._get_tenant_network_types(),
|
||||
['gre', 'vlan', 'flat', 'local'])
|
||||
|
||||
def test_get_tenant_network_types_multi(self):
|
||||
self.test_config.set('overlay-network-type', 'gre vxlan')
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
context._get_tenant_network_types(),
|
||||
['gre', 'vxlan', 'vlan', 'flat', 'local'])
|
||||
|
||||
|
@ -71,21 +71,21 @@ class GeneralTests(CharmTestCase):
|
|||
def test_get_tenant_network_types_default(self):
|
||||
self.test_config.set('overlay-network-type', 'gre vxlan')
|
||||
self.test_config.set('default-tenant-network-type', 'vxlan')
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
context._get_tenant_network_types(),
|
||||
['vxlan', 'gre', 'vlan', 'flat', 'local'])
|
||||
|
||||
def test_get_tenant_network_types_default_dup(self):
|
||||
self.test_config.set('overlay-network-type', 'gre')
|
||||
self.test_config.set('default-tenant-network-type', 'vlan')
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
context._get_tenant_network_types(),
|
||||
['vlan', 'gre', 'flat', 'local'])
|
||||
|
||||
def test_get_tenant_network_types_empty(self):
|
||||
self.test_config.set('overlay-network-type', '')
|
||||
self.test_config.set('default-tenant-network-type', 'vlan')
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
context._get_tenant_network_types(),
|
||||
['vlan', 'flat', 'local'])
|
||||
|
||||
|
@ -113,7 +113,7 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', False)
|
||||
self.os_release.return_value = 'juno'
|
||||
self.assertEquals(context.get_l3ha(), True)
|
||||
self.assertEqual(context.get_l3ha(), True)
|
||||
|
||||
def test_get_l3ha_prejuno(self):
|
||||
self.test_config.set('enable-l3ha', True)
|
||||
|
@ -121,7 +121,7 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', False)
|
||||
self.os_release.return_value = 'icehouse'
|
||||
self.assertEquals(context.get_l3ha(), False)
|
||||
self.assertEqual(context.get_l3ha(), False)
|
||||
|
||||
def test_get_l3ha_l2pop(self):
|
||||
self.test_config.set('enable-l3ha', True)
|
||||
|
@ -129,7 +129,7 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', True)
|
||||
self.os_release.return_value = 'juno'
|
||||
self.assertEquals(context.get_l3ha(), False)
|
||||
self.assertEqual(context.get_l3ha(), False)
|
||||
|
||||
def test_get_dvr(self):
|
||||
self.test_config.set('enable-dvr', True)
|
||||
|
@ -138,7 +138,7 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', True)
|
||||
self.os_release.return_value = 'juno'
|
||||
self.assertEquals(context.get_dvr(), True)
|
||||
self.assertEqual(context.get_dvr(), True)
|
||||
|
||||
def test_get_dvr_explicit_off(self):
|
||||
self.test_config.set('enable-dvr', False)
|
||||
|
@ -147,7 +147,7 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', True)
|
||||
self.os_release.return_value = 'juno'
|
||||
self.assertEquals(context.get_dvr(), False)
|
||||
self.assertEqual(context.get_dvr(), False)
|
||||
|
||||
def test_get_dvr_prejuno(self):
|
||||
self.test_config.set('enable-dvr', True)
|
||||
|
@ -156,7 +156,7 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', True)
|
||||
self.os_release.return_value = 'icehouse'
|
||||
self.assertEquals(context.get_dvr(), False)
|
||||
self.assertEqual(context.get_dvr(), False)
|
||||
|
||||
def test_get_dvr_gre(self):
|
||||
self.test_config.set('enable-dvr', True)
|
||||
|
@ -165,7 +165,7 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', True)
|
||||
self.os_release.return_value = 'juno'
|
||||
self.assertEquals(context.get_dvr(), False)
|
||||
self.assertEqual(context.get_dvr(), False)
|
||||
|
||||
def test_get_dvr_gre_kilo(self):
|
||||
self.test_config.set('enable-dvr', True)
|
||||
|
@ -174,7 +174,7 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', True)
|
||||
self.os_release.return_value = 'kilo'
|
||||
self.assertEquals(context.get_dvr(), True)
|
||||
self.assertEqual(context.get_dvr(), True)
|
||||
|
||||
def test_get_dvr_vxlan_kilo(self):
|
||||
self.test_config.set('enable-dvr', True)
|
||||
|
@ -183,7 +183,7 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', True)
|
||||
self.os_release.return_value = 'kilo'
|
||||
self.assertEquals(context.get_dvr(), True)
|
||||
self.assertEqual(context.get_dvr(), True)
|
||||
|
||||
def test_get_dvr_l3ha_on(self):
|
||||
self.test_config.set('enable-dvr', True)
|
||||
|
@ -192,7 +192,7 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', False)
|
||||
self.os_release.return_value = 'juno'
|
||||
self.assertEquals(context.get_dvr(), False)
|
||||
self.assertEqual(context.get_dvr(), False)
|
||||
|
||||
def test_get_dvr_l2pop(self):
|
||||
self.test_config.set('enable-dvr', True)
|
||||
|
@ -201,13 +201,13 @@ class GeneralTests(CharmTestCase):
|
|||
self.test_config.set('neutron-plugin', 'ovs')
|
||||
self.test_config.set('l2-population', False)
|
||||
self.os_release.return_value = 'juno'
|
||||
self.assertEquals(context.get_dvr(), False)
|
||||
self.assertEqual(context.get_dvr(), False)
|
||||
|
||||
def test_get_dns_domain(self):
|
||||
self.test_config.set('dns-domain', 'example.org.')
|
||||
self.test_config.set('enable-ml2-dns', True)
|
||||
self.os_release.return_value = 'mitaka'
|
||||
self.assertEquals(context.get_dns_domain(), 'example.org.')
|
||||
self.assertEqual(context.get_dns_domain(), 'example.org.')
|
||||
|
||||
def test_get_dns_domain_bad_values(self):
|
||||
self.os_release.return_value = 'mitaka'
|
||||
|
@ -226,37 +226,37 @@ class GeneralTests(CharmTestCase):
|
|||
|
||||
def test_get_ml2_mechanism_drivers(self):
|
||||
self.os_release.return_value = 'mitaka'
|
||||
self.assertEquals(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,hyperv,l2population')
|
||||
self.assertEqual(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,hyperv,l2population')
|
||||
|
||||
def test_get_ml2_mechanism_drivers_kilo(self):
|
||||
self.os_release.return_value = 'kilo'
|
||||
self.assertEquals(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,hyperv,l2population')
|
||||
self.assertEqual(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,hyperv,l2population')
|
||||
|
||||
def test_get_ml2_mechanism_drivers_liberty(self):
|
||||
self.os_release.return_value = 'liberty'
|
||||
self.assertEquals(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,l2population')
|
||||
self.assertEqual(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,l2population')
|
||||
|
||||
def test_get_ml2_mechanism_drivers_no_l2pop(self):
|
||||
self.os_release.return_value = 'mitaka'
|
||||
self.test_config.set('l2-population', False)
|
||||
self.assertEquals(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,hyperv')
|
||||
self.assertEqual(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,hyperv')
|
||||
|
||||
def test_get_ml2_mechanism_drivers_sriov(self):
|
||||
self.os_release.return_value = 'mitaka'
|
||||
self.test_config.set('enable-sriov', True)
|
||||
self.assertEquals(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,hyperv,l2population,sriovnicswitch')
|
||||
self.assertEqual(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,hyperv,l2population,sriovnicswitch')
|
||||
|
||||
def test_get_ml2_mechanism_drivers_no_l2pop_sriov(self):
|
||||
self.os_release.return_value = 'mitaka'
|
||||
self.test_config.set('enable-sriov', True)
|
||||
self.test_config.set('l2-population', False)
|
||||
self.assertEquals(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,hyperv,sriovnicswitch')
|
||||
self.assertEqual(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,hyperv,sriovnicswitch')
|
||||
|
||||
|
||||
class IdentityServiceContext(CharmTestCase):
|
||||
|
@ -290,14 +290,14 @@ class IdentityServiceContext(CharmTestCase):
|
|||
}
|
||||
_rget.return_value = id_data
|
||||
ids_ctxt = context.IdentityServiceContext()
|
||||
self.assertEquals(ids_ctxt()['region'], 'region457')
|
||||
self.assertEqual(ids_ctxt()['region'], 'region457')
|
||||
|
||||
@patch.object(charmhelpers.contrib.openstack.context, 'relation_ids')
|
||||
@patch.object(charmhelpers.contrib.openstack.context, 'log')
|
||||
def test_ids_ctxt_no_rels(self, _log, _rids):
|
||||
_rids.return_value = []
|
||||
ids_ctxt = context.IdentityServiceContext()
|
||||
self.assertEquals(ids_ctxt(), None)
|
||||
self.assertEqual(ids_ctxt(), None)
|
||||
|
||||
|
||||
class HAProxyContextTest(CharmTestCase):
|
||||
|
@ -371,7 +371,7 @@ class HAProxyContextTest(CharmTestCase):
|
|||
}
|
||||
_import().api_port.return_value = 9696
|
||||
hap_ctxt = context.HAProxyContext()
|
||||
self.assertEquals(hap_ctxt(), ctxt_data)
|
||||
self.assertEqual(hap_ctxt(), ctxt_data)
|
||||
_open.assert_called_with('/etc/default/haproxy', 'w')
|
||||
|
||||
|
||||
|
@ -446,7 +446,7 @@ class NeutronCCContextTest(CharmTestCase):
|
|||
napi_ctxt = context.NeutronCCContext()
|
||||
self.os_release.return_value = 'havana'
|
||||
with patch.object(napi_ctxt, '_ensure_packages'):
|
||||
self.assertEquals(ctxt_data, napi_ctxt())
|
||||
self.assertEqual(ctxt_data, napi_ctxt())
|
||||
|
||||
@patch.object(context.NeutronCCContext, 'network_manager')
|
||||
@patch.object(context.NeutronCCContext, 'plugin')
|
||||
|
@ -474,8 +474,8 @@ class NeutronCCContextTest(CharmTestCase):
|
|||
napi_ctxt = context.NeutronCCContext()
|
||||
with patch.object(napi_ctxt, '_ensure_packages'):
|
||||
ctxt = napi_ctxt()
|
||||
self.assertEquals('example.org.', ctxt['dns_domain'])
|
||||
self.assertEquals('dns', ctxt['extension_drivers'])
|
||||
self.assertEqual('example.org.', ctxt['dns_domain'])
|
||||
self.assertEqual('dns', ctxt['extension_drivers'])
|
||||
|
||||
@patch.object(context.NeutronCCContext, 'network_manager')
|
||||
@patch.object(context.NeutronCCContext, 'plugin')
|
||||
|
@ -532,7 +532,7 @@ class NeutronCCContextTest(CharmTestCase):
|
|||
napi_ctxt = context.NeutronCCContext()
|
||||
self.os_release.return_value = 'havana'
|
||||
with patch.object(napi_ctxt, '_ensure_packages'):
|
||||
self.assertEquals(ctxt_data, napi_ctxt())
|
||||
self.assertEqual(ctxt_data, napi_ctxt())
|
||||
|
||||
@patch.object(context.NeutronCCContext, 'network_manager')
|
||||
@patch.object(context.NeutronCCContext, 'plugin')
|
||||
|
@ -576,7 +576,7 @@ class NeutronCCContextTest(CharmTestCase):
|
|||
}
|
||||
napi_ctxt = context.NeutronCCContext()
|
||||
with patch.object(napi_ctxt, '_ensure_packages'):
|
||||
self.assertEquals(ctxt_data, napi_ctxt())
|
||||
self.assertEqual(ctxt_data, napi_ctxt())
|
||||
|
||||
@patch.object(context.NeutronCCContext, 'network_manager')
|
||||
@patch.object(context.NeutronCCContext, 'plugin')
|
||||
|
@ -633,7 +633,7 @@ class NeutronCCContextTest(CharmTestCase):
|
|||
napi_ctxt = context.NeutronCCContext()
|
||||
self.os_release.return_value = 'kilo'
|
||||
with patch.object(napi_ctxt, '_ensure_packages'):
|
||||
self.assertEquals(ctxt_data, napi_ctxt())
|
||||
self.assertEqual(ctxt_data, napi_ctxt())
|
||||
|
||||
@patch.object(context.NeutronCCContext, 'network_manager')
|
||||
@patch.object(context.NeutronCCContext, 'plugin')
|
||||
|
@ -656,15 +656,15 @@ class NeutronCCContextTest(CharmTestCase):
|
|||
self.test_relation.set({'nova_url': nova_url,
|
||||
'restart_trigger': 'bob'})
|
||||
napi_ctxt = context.NeutronCCContext()
|
||||
self.assertEquals(nova_url, napi_ctxt()['nova_url'])
|
||||
self.assertEquals('bob', napi_ctxt()['restart_trigger'])
|
||||
self.assertEquals(self.api_port, napi_ctxt()['neutron_bind_port'])
|
||||
self.assertEqual(nova_url, napi_ctxt()['nova_url'])
|
||||
self.assertEqual('bob', napi_ctxt()['restart_trigger'])
|
||||
self.assertEqual(self.api_port, napi_ctxt()['neutron_bind_port'])
|
||||
|
||||
def test_neutroncc_context_manager(self):
|
||||
napi_ctxt = context.NeutronCCContext()
|
||||
self.assertEquals(napi_ctxt.network_manager, 'neutron')
|
||||
self.assertEquals(napi_ctxt.plugin, 'ovs')
|
||||
self.assertEquals(napi_ctxt.neutron_security_groups, True)
|
||||
self.assertEqual(napi_ctxt.network_manager, 'neutron')
|
||||
self.assertEqual(napi_ctxt.plugin, 'ovs')
|
||||
self.assertEqual(napi_ctxt.neutron_security_groups, True)
|
||||
|
||||
def test_neutroncc_context_manager_pkgs(self):
|
||||
napi_ctxt = context.NeutronCCContext()
|
||||
|
@ -690,7 +690,7 @@ class NeutronCCContextTest(CharmTestCase):
|
|||
'nsx_username': 'bob',
|
||||
}
|
||||
for key in expect.iterkeys():
|
||||
self.assertEquals(napi_ctxt[key], expect[key])
|
||||
self.assertEqual(napi_ctxt[key], expect[key])
|
||||
|
||||
@patch.object(context.NeutronCCContext, 'network_manager')
|
||||
@patch.object(context.NeutronCCContext, 'plugin')
|
||||
|
@ -710,7 +710,7 @@ class NeutronCCContextTest(CharmTestCase):
|
|||
'vsd_netpart_name': 'foo-enterprise',
|
||||
}
|
||||
for key in expect.iterkeys():
|
||||
self.assertEquals(napi_ctxt[key], expect[key])
|
||||
self.assertEqual(napi_ctxt[key], expect[key])
|
||||
|
||||
|
||||
class EtcdContextTest(CharmTestCase):
|
||||
|
@ -729,7 +729,7 @@ class EtcdContextTest(CharmTestCase):
|
|||
ctxt = context.EtcdContext()()
|
||||
expect = {'cluster': ''}
|
||||
|
||||
self.assertEquals(expect, ctxt)
|
||||
self.assertEqual(expect, ctxt)
|
||||
|
||||
def test_some_related_units(self):
|
||||
self.related_units.return_value = ['unit1']
|
||||
|
@ -743,7 +743,7 @@ class EtcdContextTest(CharmTestCase):
|
|||
ctxt = context.EtcdContext()()
|
||||
expect = {'cluster': result}
|
||||
|
||||
self.assertEquals(expect, ctxt)
|
||||
self.assertEqual(expect, ctxt)
|
||||
|
||||
def test_early_exit(self):
|
||||
self.test_config.set('neutron-plugin', 'notCalico')
|
||||
|
@ -757,7 +757,7 @@ class EtcdContextTest(CharmTestCase):
|
|||
ctxt = context.EtcdContext()()
|
||||
expect = {'cluster': ''}
|
||||
|
||||
self.assertEquals(expect, ctxt)
|
||||
self.assertEqual(expect, ctxt)
|
||||
|
||||
|
||||
class NeutronApiSDNContextTest(CharmTestCase):
|
||||
|
@ -771,12 +771,12 @@ class NeutronApiSDNContextTest(CharmTestCase):
|
|||
|
||||
def test_init(self):
|
||||
napisdn_ctxt = context.NeutronApiSDNContext()
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
napisdn_ctxt.interfaces,
|
||||
['neutron-plugin-api-subordinate']
|
||||
)
|
||||
self.assertEquals(napisdn_ctxt.services, ['neutron-api'])
|
||||
self.assertEquals(
|
||||
self.assertEqual(napisdn_ctxt.services, ['neutron-api'])
|
||||
self.assertEqual(
|
||||
napisdn_ctxt.config_file,
|
||||
'/etc/neutron/neutron.conf'
|
||||
)
|
||||
|
@ -793,7 +793,7 @@ class NeutronApiSDNContextTest(CharmTestCase):
|
|||
self.relation_ids.return_value = ['rid2']
|
||||
self.related_units.return_value = ['unit1']
|
||||
napisdn_ctxt = context.NeutronApiSDNContext()()
|
||||
self.assertEquals(napisdn_ctxt, expect)
|
||||
self.assertEqual(napisdn_ctxt, expect)
|
||||
|
||||
def test_defaults(self):
|
||||
self.ctxt_check(
|
||||
|
@ -888,14 +888,14 @@ class NeutronApiSDNConfigFileContextTest(CharmTestCase):
|
|||
self.relation_ids.return_value = ['rid2']
|
||||
self.related_units.return_value = ['unit1']
|
||||
napisdn_ctxt = context.NeutronApiSDNConfigFileContext()()
|
||||
self.assertEquals(napisdn_ctxt, {
|
||||
self.assertEqual(napisdn_ctxt, {
|
||||
'config': '/etc/neutron/superplugin.ini'
|
||||
})
|
||||
|
||||
def test_default(self):
|
||||
self.relation_ids.return_value = []
|
||||
napisdn_ctxt = context.NeutronApiSDNConfigFileContext()()
|
||||
self.assertEquals(napisdn_ctxt, {
|
||||
self.assertEqual(napisdn_ctxt, {
|
||||
'config': '/etc/neutron/plugins/ml2/ml2_conf.ini'
|
||||
})
|
||||
|
||||
|
@ -958,7 +958,7 @@ class NeutronApiApiPasteContextTest(CharmTestCase):
|
|||
self.relation_ids.return_value = ['rid2']
|
||||
self.related_units.return_value = ['unit1']
|
||||
napiapipaste_ctxt = context.NeutronApiApiPasteContext()()
|
||||
self.assertEquals(napiapipaste_ctxt, {'extra_middleware': middleware})
|
||||
self.assertEqual(napiapipaste_ctxt, {'extra_middleware': middleware})
|
||||
|
||||
def __test_arg(self, key):
|
||||
middleware = [{'name': 'middleware_1',
|
||||
|
@ -1006,7 +1006,7 @@ class MidonetContextTest(CharmTestCase):
|
|||
ctxt = context.MidonetContext()()
|
||||
expect = {}
|
||||
|
||||
self.assertEquals(expect, ctxt)
|
||||
self.assertEqual(expect, ctxt)
|
||||
|
||||
def test_some_related_units(self):
|
||||
self.related_units.return_value = ['unit1']
|
||||
|
@ -1017,4 +1017,4 @@ class MidonetContextTest(CharmTestCase):
|
|||
expect = {'midonet_api_ip': '11.11.11.11',
|
||||
'midonet_api_port': '8080'}
|
||||
|
||||
self.assertEquals(expect, ctxt)
|
||||
self.assertEqual(expect, ctxt)
|
||||
|
|
|
@ -281,7 +281,7 @@ class TestNeutronAPIUtils(CharmTestCase):
|
|||
def test_keystone_ca_cert_b64_no_cert_file(self, _isfile):
|
||||
_isfile.return_value = False
|
||||
cert = nutils.keystone_ca_cert_b64()
|
||||
self.assertEquals(cert, None)
|
||||
self.assertEqual(cert, None)
|
||||
|
||||
@patch('os.path.isfile')
|
||||
def test_keystone_ca_cert_b64(self, _isfile):
|
||||
|
@ -417,7 +417,7 @@ class TestNeutronAPIUtils(CharmTestCase):
|
|||
creds = {}
|
||||
IdentityServiceContext.return_value = \
|
||||
DummyIdentityServiceContext(return_value=creds)
|
||||
self.assertEquals(nutils.get_neutron_client(), None)
|
||||
self.assertEqual(nutils.get_neutron_client(), None)
|
||||
|
||||
@patch.object(nutils, 'get_neutron_client')
|
||||
def test_router_feature_present_keymissing(self, get_neutron_client):
|
||||
|
@ -437,7 +437,7 @@ class TestNeutronAPIUtils(CharmTestCase):
|
|||
]
|
||||
}
|
||||
get_neutron_client.list_routers.return_value = routers
|
||||
self.assertEquals(nutils.router_feature_present('ha'), False)
|
||||
self.assertEqual(nutils.router_feature_present('ha'), False)
|
||||
|
||||
@patch.object(nutils, 'get_neutron_client')
|
||||
def test_router_feature_present_keyfalse(self, get_neutron_client):
|
||||
|
@ -460,7 +460,7 @@ class TestNeutronAPIUtils(CharmTestCase):
|
|||
dummy_client = MagicMock()
|
||||
dummy_client.list_routers.return_value = routers
|
||||
get_neutron_client.return_value = dummy_client
|
||||
self.assertEquals(nutils.router_feature_present('ha'), False)
|
||||
self.assertEqual(nutils.router_feature_present('ha'), False)
|
||||
|
||||
@patch.object(nutils, 'get_neutron_client')
|
||||
def test_router_feature_present_keytrue(self, get_neutron_client):
|
||||
|
@ -484,26 +484,26 @@ class TestNeutronAPIUtils(CharmTestCase):
|
|||
dummy_client = MagicMock()
|
||||
dummy_client.list_routers.return_value = routers
|
||||
get_neutron_client.return_value = dummy_client
|
||||
self.assertEquals(nutils.router_feature_present('ha'), True)
|
||||
self.assertEqual(nutils.router_feature_present('ha'), True)
|
||||
|
||||
@patch.object(nutils, 'get_neutron_client')
|
||||
def test_neutron_ready(self, get_neutron_client):
|
||||
dummy_client = MagicMock()
|
||||
dummy_client.list_routers.return_value = []
|
||||
get_neutron_client.return_value = dummy_client
|
||||
self.assertEquals(nutils.neutron_ready(), True)
|
||||
self.assertEqual(nutils.neutron_ready(), True)
|
||||
|
||||
@patch.object(nutils, 'get_neutron_client')
|
||||
def test_neutron_ready_noclient(self, get_neutron_client):
|
||||
get_neutron_client.return_value = None
|
||||
self.assertEquals(nutils.neutron_ready(), False)
|
||||
self.assertEqual(nutils.neutron_ready(), False)
|
||||
|
||||
@patch.object(nutils, 'get_neutron_client')
|
||||
def test_neutron_ready_clientexception(self, get_neutron_client):
|
||||
dummy_client = MagicMock()
|
||||
dummy_client.list_routers.side_effect = Exception('Boom!')
|
||||
get_neutron_client.return_value = dummy_client
|
||||
self.assertEquals(nutils.neutron_ready(), False)
|
||||
self.assertEqual(nutils.neutron_ready(), False)
|
||||
|
||||
@patch.object(nutils, 'git_install_requested')
|
||||
@patch.object(nutils, 'git_clone_and_install')
|
||||
|
@ -539,12 +539,12 @@ class TestNeutronAPIUtils(CharmTestCase):
|
|||
call('/var/log/neutron', owner='neutron',
|
||||
group='neutron', perms=0755, force=False),
|
||||
]
|
||||
self.assertEquals(mkdir.call_args_list, expected)
|
||||
self.assertEqual(mkdir.call_args_list, expected)
|
||||
expected = [
|
||||
call('/var/log/neutron/server.log', '', owner='neutron',
|
||||
group='neutron', perms=0600),
|
||||
]
|
||||
self.assertEquals(write_file.call_args_list, expected)
|
||||
self.assertEqual(write_file.call_args_list, expected)
|
||||
|
||||
@patch('os.path.join')
|
||||
@patch('os.path.exists')
|
||||
|
@ -583,11 +583,11 @@ class TestNeutronAPIUtils(CharmTestCase):
|
|||
'/etc/init/neutron-server.conf',
|
||||
neutron_api_context, perms=0o644),
|
||||
]
|
||||
self.assertEquals(self.render.call_args_list, expected)
|
||||
self.assertEqual(self.render.call_args_list, expected)
|
||||
expected = [
|
||||
call('neutron-server'),
|
||||
]
|
||||
self.assertEquals(self.service_restart.call_args_list, expected)
|
||||
self.assertEqual(self.service_restart.call_args_list, expected)
|
||||
|
||||
@patch('os.listdir')
|
||||
@patch('os.path.join')
|
||||
|
@ -609,7 +609,7 @@ class TestNeutronAPIUtils(CharmTestCase):
|
|||
call('git/neutron-server.init.in.template', 'joined-string',
|
||||
{'daemon_path': 'joined-string'}, perms=420)
|
||||
]
|
||||
self.assertEquals(self.render.call_args_list, expected)
|
||||
self.assertEqual(self.render.call_args_list, expected)
|
||||
|
||||
def test_stamp_neutron_database(self):
|
||||
nutils.stamp_neutron_database('icehouse')
|
||||
|
|
Loading…
Reference in New Issue