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: Ib96a90d6e4c4e8c72ddd62820ca794d29f8dbfae Closes-Bug: #1329757
This commit is contained in:
zhangyangyang
parent
f778d87ca8
commit
124c91e1b3
|
|
@ -41,21 +41,21 @@ class CeilometerContextsTest(CharmTestCase):
|
|||
def test_logging_context(self):
|
||||
self.test_config.set('debug', False)
|
||||
self.test_config.set('verbose', False)
|
||||
self.assertEquals(contexts.LoggingConfigContext()(),
|
||||
{'debug': False, 'verbose': False})
|
||||
self.assertEqual(contexts.LoggingConfigContext()(),
|
||||
{'debug': False, 'verbose': False})
|
||||
self.test_config.set('debug', True)
|
||||
self.test_config.set('verbose', False)
|
||||
self.assertEquals(contexts.LoggingConfigContext()(),
|
||||
{'debug': True, 'verbose': False})
|
||||
self.assertEqual(contexts.LoggingConfigContext()(),
|
||||
{'debug': True, 'verbose': False})
|
||||
self.test_config.set('debug', True)
|
||||
self.test_config.set('verbose', True)
|
||||
self.assertEquals(contexts.LoggingConfigContext()(),
|
||||
{'debug': True, 'verbose': True})
|
||||
self.assertEqual(contexts.LoggingConfigContext()(),
|
||||
{'debug': True, 'verbose': True})
|
||||
|
||||
def test_mongodb_context_not_related(self):
|
||||
self.relation_ids.return_value = []
|
||||
self.os_release.return_value = 'icehouse'
|
||||
self.assertEquals(contexts.MongoDBContext()(), {})
|
||||
self.assertEqual(contexts.MongoDBContext()(), {})
|
||||
|
||||
def test_mongodb_context_related(self):
|
||||
self.relation_ids.return_value = ['shared-db:0']
|
||||
|
|
@ -66,9 +66,9 @@ class CeilometerContextsTest(CharmTestCase):
|
|||
}
|
||||
self.test_relation.set(data)
|
||||
self.os_release.return_value = 'havana'
|
||||
self.assertEquals(contexts.MongoDBContext()(),
|
||||
{'db_host': 'mongodb', 'db_port': 8090,
|
||||
'db_name': 'ceilometer'})
|
||||
self.assertEqual(contexts.MongoDBContext()(),
|
||||
{'db_host': 'mongodb', 'db_port': 8090,
|
||||
'db_name': 'ceilometer'})
|
||||
|
||||
def test_mongodb_context_related_replset_single_mongo(self):
|
||||
self.relation_ids.return_value = ['shared-db:0']
|
||||
|
|
@ -80,9 +80,9 @@ class CeilometerContextsTest(CharmTestCase):
|
|||
}
|
||||
self.test_relation.set(data)
|
||||
self.os_release.return_value = 'icehouse'
|
||||
self.assertEquals(contexts.MongoDBContext()(),
|
||||
{'db_host': 'mongodb-0', 'db_port': 8090,
|
||||
'db_name': 'ceilometer'})
|
||||
self.assertEqual(contexts.MongoDBContext()(),
|
||||
{'db_host': 'mongodb-0', 'db_port': 8090,
|
||||
'db_name': 'ceilometer'})
|
||||
|
||||
@patch.object(contexts, 'context_complete')
|
||||
def test_mongodb_context_related_replset_missing_values(self, mock_ctxcmp):
|
||||
|
|
@ -96,7 +96,7 @@ class CeilometerContextsTest(CharmTestCase):
|
|||
}
|
||||
self.test_relation.set(data)
|
||||
self.os_release.return_value = 'icehouse'
|
||||
self.assertEquals(contexts.MongoDBContext()(), {})
|
||||
self.assertEqual(contexts.MongoDBContext()(), {})
|
||||
|
||||
def test_mongodb_context_related_replset_multiple_mongo(self):
|
||||
self.relation_ids.return_value = ['shared-db:0']
|
||||
|
|
@ -119,14 +119,14 @@ class CeilometerContextsTest(CharmTestCase):
|
|||
self.relation_get.side_effect = relation_get
|
||||
|
||||
self.os_release.return_value = 'icehouse'
|
||||
self.assertEquals(contexts.MongoDBContext()(),
|
||||
{'db_mongo_servers': 'mongodb-0:8090,mongodb-1:8090',
|
||||
'db_name': 'ceilometer', 'db_replset': 'replset-1'})
|
||||
self.assertEqual(contexts.MongoDBContext()(),
|
||||
{'db_mongo_servers': 'mongodb-0:8090,mongodb-1:8090',
|
||||
'db_name': 'ceilometer', 'db_replset': 'replset-1'})
|
||||
|
||||
@patch.object(utils, 'get_shared_secret')
|
||||
def test_ceilometer_context(self, secret):
|
||||
secret.return_value = 'mysecret'
|
||||
self.assertEquals(contexts.CeilometerContext()(), {
|
||||
self.assertEqual(contexts.CeilometerContext()(), {
|
||||
'port': 8777,
|
||||
'metering_secret': 'mysecret',
|
||||
'api_workers': 1,
|
||||
|
|
@ -140,7 +140,7 @@ class CeilometerContextsTest(CharmTestCase):
|
|||
self.test_config.set('metering-time-to-live', 7.776e+06)
|
||||
self.test_config.set('event-time-to-live', 7.776e+06)
|
||||
context = contexts.CeilometerContext()()
|
||||
self.assertEquals(context, {
|
||||
self.assertEqual(context, {
|
||||
'port': 8777,
|
||||
'metering_secret': 'mysecret',
|
||||
'api_workers': 1,
|
||||
|
|
@ -158,18 +158,18 @@ class CeilometerContextsTest(CharmTestCase):
|
|||
'keystone_host': 'test'
|
||||
}
|
||||
self.test_relation.set(data)
|
||||
self.assertEquals(contexts.CeilometerServiceContext()(), data)
|
||||
self.assertEqual(contexts.CeilometerServiceContext()(), data)
|
||||
|
||||
def test_ceilometer_service_context_not_related(self):
|
||||
self.relation_ids.return_value = []
|
||||
self.assertEquals(contexts.CeilometerServiceContext()(), {})
|
||||
self.assertEqual(contexts.CeilometerServiceContext()(), {})
|
||||
|
||||
@patch('os.path.exists')
|
||||
def test_get_shared_secret_existing(self, exists):
|
||||
exists.return_value = True
|
||||
with mock_open(utils.SHARED_SECRET, u'mysecret'):
|
||||
self.assertEquals(utils.get_shared_secret(),
|
||||
'mysecret')
|
||||
self.assertEqual(utils.get_shared_secret(),
|
||||
'mysecret')
|
||||
|
||||
@patch('uuid.uuid4')
|
||||
@patch('os.path.exists')
|
||||
|
|
@ -177,8 +177,8 @@ class CeilometerContextsTest(CharmTestCase):
|
|||
exists.return_value = False
|
||||
uuid4.return_value = 'newsecret'
|
||||
with patch('__builtin__.open'):
|
||||
self.assertEquals(utils.get_shared_secret(),
|
||||
'newsecret')
|
||||
self.assertEqual(utils.get_shared_secret(),
|
||||
'newsecret')
|
||||
|
||||
@patch.object(contexts, 'determine_apache_port')
|
||||
@patch.object(contexts, 'determine_api_port')
|
||||
|
|
@ -194,4 +194,4 @@ class CeilometerContextsTest(CharmTestCase):
|
|||
'service_ports': {'ceilometer_api': [haproxy_port, apache_port]},
|
||||
'port': api_port
|
||||
}
|
||||
self.assertEquals(contexts.HAProxyContext()(), expected)
|
||||
self.assertEqual(contexts.HAProxyContext()(), expected)
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ class CeilometerHooksTest(CharmTestCase):
|
|||
'ceilometer/1',
|
||||
'ceilometer/2']
|
||||
hooks.hooks.execute(['hooks/upgrade-charm'])
|
||||
self.assertEquals(cluster_joined.call_count, 3)
|
||||
self.assertEqual(cluster_joined.call_count, 3)
|
||||
any_changed.assert_called_once()
|
||||
|
||||
@patch.object(hooks, 'install_event_pipeline_setting')
|
||||
|
|
@ -360,7 +360,7 @@ class CeilometerHooksTest(CharmTestCase):
|
|||
self.peer_retrieve.return_value = "leader_secret"
|
||||
mock_get_secret.return_value = "leader_secret"
|
||||
hooks.hooks.execute(['hooks/cluster-relation-changed'])
|
||||
self.assertEquals(mock_set_secret.call_count, 0)
|
||||
self.assertEqual(mock_set_secret.call_count, 0)
|
||||
|
||||
@patch('charmhelpers.core.hookenv.config')
|
||||
@patch.object(hooks, 'get_hacluster_config')
|
||||
|
|
@ -375,7 +375,7 @@ class CeilometerHooksTest(CharmTestCase):
|
|||
mock_iface.return_value = 'eth0'
|
||||
mock_netmask.return_value = '255.255.255.10'
|
||||
hooks.hooks.execute(['hooks/ha-relation-joined'])
|
||||
self.assertEquals(self.relation_set.call_count, 2)
|
||||
self.assertEqual(self.relation_set.call_count, 2)
|
||||
|
||||
exp_resources = {
|
||||
'res_ceilometer_haproxy': 'lsb:haproxy',
|
||||
|
|
@ -425,7 +425,7 @@ class CeilometerHooksTest(CharmTestCase):
|
|||
'ha-mcastport': 5802}
|
||||
|
||||
hooks.hooks.execute(['hooks/ha-relation-joined'])
|
||||
self.assertEquals(self.relation_set.call_count, 2)
|
||||
self.assertEqual(self.relation_set.call_count, 2)
|
||||
|
||||
exp_resources = {
|
||||
'res_ceilometer_haproxy': 'lsb:haproxy',
|
||||
|
|
@ -514,7 +514,7 @@ class CeilometerHooksTest(CharmTestCase):
|
|||
def test_ha_changed_not_clustered(self, mock_keystone_joined, mock_config):
|
||||
self.relation_get.return_value = None
|
||||
hooks.hooks.execute(['hooks/ha-relation-changed'])
|
||||
self.assertEquals(mock_keystone_joined.call_count, 0)
|
||||
self.assertEqual(mock_keystone_joined.call_count, 0)
|
||||
|
||||
@patch('charmhelpers.core.hookenv.config')
|
||||
@patch.object(hooks, 'keystone_joined')
|
||||
|
|
@ -522,7 +522,7 @@ class CeilometerHooksTest(CharmTestCase):
|
|||
self.relation_get.return_value = 'yes'
|
||||
self.relation_ids.return_value = ['identity-service/0']
|
||||
hooks.hooks.execute(['hooks/ha-relation-changed'])
|
||||
self.assertEquals(mock_keystone_joined.call_count, 1)
|
||||
self.assertEqual(mock_keystone_joined.call_count, 1)
|
||||
|
||||
def test_metric_service_joined(self):
|
||||
self.filter_installed_packages.return_value = ['python-gnocchiclient']
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ class CeilometerUtilsTest(CharmTestCase):
|
|||
self.get_os_codename_install_source.return_value = 'icehouse'
|
||||
self.os_release.return_value = 'icehouse'
|
||||
restart_map = utils.restart_map()
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
restart_map,
|
||||
{'/etc/ceilometer/ceilometer.conf': [
|
||||
'ceilometer-agent-central',
|
||||
|
|
@ -132,7 +132,7 @@ class CeilometerUtilsTest(CharmTestCase):
|
|||
self.os_release.return_value = 'mitaka'
|
||||
self.maxDiff = None
|
||||
restart_map = utils.restart_map()
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
restart_map,
|
||||
{'/etc/ceilometer/ceilometer.conf': [
|
||||
'ceilometer-agent-central',
|
||||
|
|
|
|||
Loading…
Reference in New Issue